some build changes, some unresolved dependencies

reviewable/pr12692/r4
Yash Tibrewal 8 years ago
parent 15ce142d65
commit 547653ebdb
  1. 1
      build.yaml
  2. 21
      src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
  3. 1
      src/core/ext/transport/chttp2/transport/stream_lists.cc
  4. 1
      src/core/lib/iomgr/tcp_windows.cc
  5. 2
      src/core/lib/support/cpu_iphone.cc
  6. 1
      src/core/lib/support/cpu_posix.cc
  7. 1
      src/core/lib/support/cpu_windows.cc
  8. 1
      src/core/lib/support/string_util_windows.cc
  9. 2
      src/core/lib/support/wrap_memcpy.cc
  10. 7
      src/core/lib/transport/static_metadata.h
  11. 8
      tools/codegen/core/gen_static_metadata.py
  12. 1
      tools/run_tests/generated/sources_and_headers.json

@ -763,6 +763,7 @@ filegroups:
- gpr
filegroups:
- grpc_trace_headers
- grpc_base_headers
- name: grpc_trace_headers
headers:
- src/core/lib/debug/trace.h

@ -1,20 +1,3 @@
/*
*
* Copyright 2017 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/* Automatically generated nanopb constant definitions */
/* Generated by nanopb-0.3.7-dev */
@ -97,7 +80,7 @@ const pb_field_t grpc_lb_v1_Server_fields[5] = {
#if !defined(PB_FIELD_32BIT)
/* If you get an error here, it means that you need to define PB_FIELD_32BIT
* compile-time option. You can do that in pb.h or on compiler command line.
*
*
* The reason you need to do this is that some of your messages contain tag
* numbers or field sizes that are larger than what can fit in 8 or 16 bit
* field descriptors.
@ -108,7 +91,7 @@ PB_STATIC_ASSERT((pb_membersize(grpc_lb_v1_LoadBalanceRequest, initial_request)
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
/* If you get an error here, it means that you need to define PB_FIELD_16BIT
* compile-time option. You can do that in pb.h or on compiler command line.
*
*
* The reason you need to do this is that some of your messages contain tag
* numbers or field sizes that are larger than what can fit in the default
* 8 bit descriptors.

@ -16,6 +16,7 @@
*
*/
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/ext/transport/chttp2/transport/internal.h"
#include <grpc/support/log.h>

@ -37,6 +37,7 @@
#include "src/core/lib/iomgr/sockaddr_utils.h"
#include "src/core/lib/iomgr/socket_windows.h"
#include "src/core/lib/iomgr/tcp_client.h"
#include "src/core/lib/iomgr/tcp_windows.h"
#include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/slice/slice_internal.h"

@ -18,6 +18,8 @@
#include <grpc/support/port_platform.h>
#include <grpc/support/cpu.h>
#ifdef GPR_CPU_IPHONE
/* Probably 2 instead of 1, but see comment on gpr_cpu_current_cpu. */

@ -24,6 +24,7 @@
#include <string.h>
#include <unistd.h>
#include <grpc/support/cpu.h>
#include <grpc/support/log.h>
#include <grpc/support/sync.h>
#include <grpc/support/useful.h>

@ -19,6 +19,7 @@
#include <grpc/support/port_platform.h>
#ifdef GPR_WINDOWS
#include <grpc/support/cpu.h>
#include <grpc/support/log.h>
unsigned gpr_cpu_num_cores(void) {

@ -33,6 +33,7 @@
#include <strsafe.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log_windows.h>
#include <grpc/support/string_util.h>
#include "src/core/lib/support/string.h"

@ -26,6 +26,7 @@
* Enable by setting LDFLAGS=-Wl,-wrap,memcpy when linking.
*/
extern "C" {
#ifdef __linux__
#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT)
__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
@ -38,3 +39,4 @@ void *__wrap_memcpy(void *destination, const void *source, size_t num) {
}
#endif
#endif
}

@ -27,6 +27,10 @@
#ifndef GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H
#define GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H
#ifdef __cplusplus
extern "C" {
#endif
#include "src/core/lib/transport/metadata.h"
#define GRPC_STATIC_MDSTR_COUNT 100
@ -584,4 +588,7 @@ extern const uint8_t grpc_static_accept_stream_encoding_metadata[4];
(GRPC_MAKE_MDELEM(&grpc_static_mdelem_table \
[grpc_static_accept_stream_encoding_metadata[(algs)]], \
GRPC_MDELEM_STORAGE_STATIC))
#ifdef __cplusplus
}
#endif
#endif /* GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H */

@ -354,6 +354,10 @@ an explanation of what's going on.
print >> H, '#ifndef GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H'
print >> H, '#define GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H'
print >> H
print >> H, '#ifdef __cplusplus'
print >> H, 'extern "C" {'
print >> H, '#endif'
print >> H
print >> H, '#include "src/core/lib/transport/metadata.h"'
print >> H
@ -589,6 +593,10 @@ print >> C, '};'
print >> H, '#define GRPC_MDELEM_ACCEPT_STREAM_ENCODING_FOR_ALGORITHMS(algs) (GRPC_MAKE_MDELEM(&grpc_static_mdelem_table[grpc_static_accept_stream_encoding_metadata[(algs)]], GRPC_MDELEM_STORAGE_STATIC))'
print >> H, '#ifdef __cplusplus'
print >> H, '}'
print >> H, '#endif'
print >> H, '#endif /* GRPC_CORE_LIB_TRANSPORT_STATIC_METADATA_H */'
H.close()

@ -8951,6 +8951,7 @@
{
"deps": [
"gpr",
"grpc_base_headers",
"grpc_trace_headers"
],
"headers": [],

Loading…
Cancel
Save