Merge pull request #9870 from ncteisen/if-opportunity-doesnt-knock-fix-the-build

Add grpc_load_reporting to grpc_cronet
pull/9757/head
Noah Eisen 8 years ago committed by GitHub
commit c240e6cd11
  1. 2
      CMakeLists.txt
  2. 2
      Makefile
  3. 1
      build.yaml
  4. 4
      src/core/plugin_registry/grpc_cronet_plugin_registry.c
  5. 1
      tools/run_tests/generated/sources_and_headers.json

@ -1334,6 +1334,8 @@ add_library(grpc_cronet
src/core/lib/tsi/ssl_transport_security.c src/core/lib/tsi/ssl_transport_security.c
src/core/lib/tsi/transport_security.c src/core/lib/tsi/transport_security.c
src/core/ext/transport/chttp2/client/chttp2_connector.c src/core/ext/transport/chttp2/client/chttp2_connector.c
src/core/ext/load_reporting/load_reporting.c
src/core/ext/load_reporting/load_reporting_filter.c
src/core/plugin_registry/grpc_cronet_plugin_registry.c src/core/plugin_registry/grpc_cronet_plugin_registry.c
) )

@ -3187,6 +3187,8 @@ LIBGRPC_CRONET_SRC = \
src/core/lib/tsi/ssl_transport_security.c \ src/core/lib/tsi/ssl_transport_security.c \
src/core/lib/tsi/transport_security.c \ src/core/lib/tsi/transport_security.c \
src/core/ext/transport/chttp2/client/chttp2_connector.c \ src/core/ext/transport/chttp2/client/chttp2_connector.c \
src/core/ext/load_reporting/load_reporting.c \
src/core/ext/load_reporting/load_reporting_filter.c \
src/core/plugin_registry/grpc_cronet_plugin_registry.c \ src/core/plugin_registry/grpc_cronet_plugin_registry.c \
PUBLIC_HEADERS_C += \ PUBLIC_HEADERS_C += \

@ -978,6 +978,7 @@ libs:
- grpc_base - grpc_base
- grpc_transport_cronet_client_secure - grpc_transport_cronet_client_secure
- grpc_transport_chttp2_client_secure - grpc_transport_chttp2_client_secure
- grpc_load_reporting
generate_plugin_registry: true generate_plugin_registry: true
platforms: platforms:
- linux - linux

@ -37,10 +37,14 @@ extern void grpc_chttp2_plugin_init(void);
extern void grpc_chttp2_plugin_shutdown(void); extern void grpc_chttp2_plugin_shutdown(void);
extern void grpc_client_channel_init(void); extern void grpc_client_channel_init(void);
extern void grpc_client_channel_shutdown(void); extern void grpc_client_channel_shutdown(void);
extern void grpc_load_reporting_plugin_init(void);
extern void grpc_load_reporting_plugin_shutdown(void);
void grpc_register_built_in_plugins(void) { void grpc_register_built_in_plugins(void) {
grpc_register_plugin(grpc_chttp2_plugin_init, grpc_register_plugin(grpc_chttp2_plugin_init,
grpc_chttp2_plugin_shutdown); grpc_chttp2_plugin_shutdown);
grpc_register_plugin(grpc_client_channel_init, grpc_register_plugin(grpc_client_channel_init,
grpc_client_channel_shutdown); grpc_client_channel_shutdown);
grpc_register_plugin(grpc_load_reporting_plugin_init,
grpc_load_reporting_plugin_shutdown);
} }

@ -5286,6 +5286,7 @@
"deps": [ "deps": [
"gpr", "gpr",
"grpc_base", "grpc_base",
"grpc_load_reporting",
"grpc_transport_chttp2_client_secure", "grpc_transport_chttp2_client_secure",
"grpc_transport_cronet_client_secure" "grpc_transport_cronet_client_secure"
], ],

Loading…
Cancel
Save