Revert "use envoy_google_grpc_external_deps for google_grpc_context_l…#8407
Revert "use envoy_google_grpc_external_deps for google_grpc_context_l…#8407htuch merged 1 commit intoenvoyproxy:masterfrom
Conversation
…ib (envoyproxy#8380)" This reverts commit 6d77245. Signed-off-by: Wayne Zhang <qiwzhang@google.com>
|
@mattklein123 @lizan @htuch could you help to merge this "revert" change? |
| @@ -3,7 +3,6 @@ licenses(["notice"]) # Apache 2 | |||
| load( | |||
There was a problem hiding this comment.
I don't think you need to revert this file?
There was a problem hiding this comment.
Yes, I can revert this file.
My new change is: to making this google_grpc_context_lib using google_grpc, not support "target:gce".
But in source/exec/BUILD,use google_grpc_select to depend on google_grpc_context_lib
which will check if google_grpc is disbled or not.
My new change will be:
diff --git a/source/exe/BUILD b/source/exe/BUILD
index 719cded40..47256f5ae 100644
--- a/source/exe/BUILD
+++ b/source/exe/BUILD
@@ -8,6 +8,7 @@ load(
"envoy_cc_posix_library",
"envoy_cc_win32_library",
"envoy_package",
+ "envoy_select_google_grpc",
)
load(
"//source/extensions:all_extensions.bzl",
@@ -71,12 +72,12 @@ envoy_cc_library(
"//source/common/api:os_sys_calls_lib",
"//source/common/common:compiler_requirements_lib",
"//source/common/common:perf_annotation_lib",
- "//source/common/grpc:google_grpc_context_lib",
"//source/common/stats:symbol_table_creator_lib",
"//source/server:hot_restart_lib",
"//source/server:hot_restart_nop_lib",
"//source/server/config_validation:server_lib",
- ] + select({
+ ] + envoy_select_google_grpc(["//source/common/grpc:google_grpc_context_lib"])
+ + select({
"//bazel:disable_signal_trace": [],
"//conditions:default": [
"//source/common/signal:sigaction_lib",
There was a problem hiding this comment.
#8409 is closed, can you advise on what PR you want reviewed?
There was a problem hiding this comment.
@htuch could you help to just merge this "revert" PR? I found out that I don't need to make any changes in upstream envoy. I just need to change copybara config to fix target.gce issue.
Basically, copybara remove dep google_grpc_context_lib from envoy_main_common_lib
…ib (envoyproxy#8380)" (envoyproxy#8407) This reverts commit 6d77245. Signed-off-by: Wayne Zhang <qiwzhang@google.com>
…ib (#8380)"
This reverts commit 6d77245.
Signed-off-by: Wayne Zhang qiwzhang@google.com
For an explanation of how to fill out the fields, please see the relevant section
in PULL_REQUESTS.md
Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
[Optional Fixes #Issue]
[Optional Deprecated:]