Changes required to make build possible: create separate grpc++_base{,_unsecure}, move grpc_compression_trace definition, and remove an assertion about library initialization from server
diff --git a/BUILD b/BUILD
index 57709e4..09b17ad 100644
--- a/BUILD
+++ b/BUILD
@@ -35,7 +35,8 @@
package(default_visibility = ["//visibility:public"])
-load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_proto_plugin")
+load("//bazel:grpc_build_system.bzl", "grpc_cc_library",
+ "grpc_proto_plugin", "grpc_cc_libraries")
# This should be updated along with build.yaml
g_stands_for = "gentle"
@@ -163,7 +164,7 @@
standalone = True,
deps = [
"gpr",
- "grpc++_base",
+ "grpc++_base_unsecure",
"grpc++_codegen_base",
"grpc++_codegen_base_src",
"grpc_unsecure",
@@ -1231,8 +1232,12 @@
],
)
-grpc_cc_library(
- name = "grpc++_base",
+grpc_cc_libraries(
+ name_list = ["grpc++_base", "grpc++_base_unsecure"],
+ additional_dep_list = [
+ ["grpc", ],
+ ["grpc_unsecure", ],
+ ],
srcs = [
"src/cpp/client/channel_cc.cc",
"src/cpp/client/client_context.cc",
@@ -1267,7 +1272,7 @@
"src/cpp/util/status.cc",
"src/cpp/util/string_ref.cc",
"src/cpp/util/time_cc.cc",
- ],
+ ],
hdrs = [
"src/cpp/client/create_channel_internal.h",
"src/cpp/common/channel_filter.h",
@@ -1276,10 +1281,7 @@
"src/cpp/server/health/health.pb.h",
"src/cpp/server/thread_pool_interface.h",
"src/cpp/thread_manager/thread_manager.h",
- ],
- external_deps = [
- "nanopb",
- ],
+ ],
language = "c++",
public_hdrs = [
"include/grpc++/alarm.h",
@@ -1329,9 +1331,8 @@
"include/grpc++/support/stub_options.h",
"include/grpc++/support/sync_stream.h",
"include/grpc++/support/time.h",
- ],
+ ],
deps = [
- "grpc_base",
"grpc++_codegen_base",
],
)