Commit 3a7a9027 authored by Andres Medina's avatar Andres Medina Committed by Chromium LUCI CQ

[grpc] Correcting grpc_config in non-main libraries.

A previous fix attempted to remove some warnings. Some source_sets were
not using the private_config needed to build. Adding the private_config.

Bug: 1152807
Test: CQ
Change-Id: I8f8f4a74affd161e7a39a99e43a8060d8421b4a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566371
Auto-Submit: Andres Medina <medinaandres@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832120}
parent 0c79411e
...@@ -1514,6 +1514,9 @@ source_set("address_sorting") { ...@@ -1514,6 +1514,9 @@ source_set("address_sorting") {
public_configs = [ public_configs = [
":grpc_config", ":grpc_config",
] ]
configs += [
":grpc_config_private",
]
include_dirs = [ include_dirs = [
"src/third_party/address_sorting/include", "src/third_party/address_sorting/include",
] ]
...@@ -1563,6 +1566,9 @@ if (current_toolchain == host_toolchain) { ...@@ -1563,6 +1566,9 @@ if (current_toolchain == host_toolchain) {
public_configs = [ public_configs = [
":grpc_config", ":grpc_config",
] ]
configs += [
":grpc_config_private",
]
} }
} }
...@@ -1621,6 +1627,9 @@ source_set("upb") { ...@@ -1621,6 +1627,9 @@ source_set("upb") {
public_configs = [ public_configs = [
":grpc_config", ":grpc_config",
] ]
configs += [
":grpc_config_private",
]
visibility = [ "./*" ] visibility = [ "./*" ]
if (!is_win) { if (!is_win) {
configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
......
...@@ -374,12 +374,12 @@ ...@@ -374,12 +374,12 @@
if repeated: if repeated:
deps.append(":{}".format(repeated_lib_name)) deps.append(":{}".format(repeated_lib_name))
%>\ %>\
${cc_library_internal(lib.name, indent, sources, deps, extra_stuff, [])} ${cc_library_internal(lib.name, indent, sources, deps, extra_stuff, extra_configs)}
% if repeated: % if repeated:
# There are some .cc files that are in multiple places. GN doesn't like # There are some .cc files that are in multiple places. GN doesn't like
# that. Moving them to another target. # that. Moving them to another target.
${cc_library_internal(repeated_lib_name, indent, repeated, repeated_deps, extra_stuff, [])} ${cc_library_internal(repeated_lib_name, indent, repeated, repeated_deps, extra_stuff, extra_configs)}
% endif % endif
</%def>\ </%def>\
<%def name="cc_library_internal(name, indent, sources, lib_deps, extra_stuff, extra_configs)">\ <%def name="cc_library_internal(name, indent, sources, lib_deps, extra_stuff, extra_configs)">\
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment