From 40e1e99f62367edb7ec94484620a969064bc3df1 Mon Sep 17 00:00:00 2001 From: ncteisen Date: Fri, 24 Feb 2017 11:45:51 -0800 Subject: [PATCH] Fix load_reporting linker error --- CMakeLists.txt | 2 ++ Makefile | 2 ++ build.yaml | 1 + src/core/plugin_registry/grpc_cronet_plugin_registry.c | 4 ++++ tools/run_tests/generated/sources_and_headers.json | 1 + 5 files changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2a2380f2e4..6de986e1992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1334,6 +1334,8 @@ add_library(grpc_cronet src/core/lib/tsi/ssl_transport_security.c src/core/lib/tsi/transport_security.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 ) diff --git a/Makefile b/Makefile index 0b0e127e53c..558c0eea0f0 100644 --- a/Makefile +++ b/Makefile @@ -3187,6 +3187,8 @@ LIBGRPC_CRONET_SRC = \ src/core/lib/tsi/ssl_transport_security.c \ src/core/lib/tsi/transport_security.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 \ PUBLIC_HEADERS_C += \ diff --git a/build.yaml b/build.yaml index 33cd692b455..588b07b3ed9 100644 --- a/build.yaml +++ b/build.yaml @@ -978,6 +978,7 @@ libs: - grpc_base - grpc_transport_cronet_client_secure - grpc_transport_chttp2_client_secure + - grpc_load_reporting generate_plugin_registry: true platforms: - linux diff --git a/src/core/plugin_registry/grpc_cronet_plugin_registry.c b/src/core/plugin_registry/grpc_cronet_plugin_registry.c index d339ed327fd..c97f47b397a 100644 --- a/src/core/plugin_registry/grpc_cronet_plugin_registry.c +++ b/src/core/plugin_registry/grpc_cronet_plugin_registry.c @@ -37,10 +37,14 @@ extern void grpc_chttp2_plugin_init(void); extern void grpc_chttp2_plugin_shutdown(void); extern void grpc_client_channel_init(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) { grpc_register_plugin(grpc_chttp2_plugin_init, grpc_chttp2_plugin_shutdown); grpc_register_plugin(grpc_client_channel_init, grpc_client_channel_shutdown); + grpc_register_plugin(grpc_load_reporting_plugin_init, + grpc_load_reporting_plugin_shutdown); } diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index b04e4bd06fa..f83a6398710 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -5286,6 +5286,7 @@ "deps": [ "gpr", "grpc_base", + "grpc_load_reporting", "grpc_transport_chttp2_client_secure", "grpc_transport_cronet_client_secure" ],