Ryan VanderMeulen
1582b2b94e
Differential Revision: https://phabricator.services.mozilla.com/D309451
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Thu, 9 Jan 2025 13:53:00 -0600
|
|
Subject: Bug 1938156 - third_party/abseil-cpp ba05f98ec72 added a group we
|
|
don't need.
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/928c6aa703b29d46632c4333b0c8b643fc08c60f
|
|
---
|
|
abseil-cpp/BUILD.gn | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/abseil-cpp/BUILD.gn b/abseil-cpp/BUILD.gn
|
|
index 1604f5b6339..8da448e6e68 100644
|
|
--- a/abseil-cpp/BUILD.gn
|
|
+++ b/abseil-cpp/BUILD.gn
|
|
@@ -39,7 +39,7 @@ component("absl") {
|
|
sources = [ file ]
|
|
}
|
|
}
|
|
- if (is_win) {
|
|
+ if (is_win && !moz_webrtc_build) {
|
|
all_dependent_configs = [ "//tools/win/DebugVisualizers:absl" ]
|
|
inputs = [
|
|
# absl.natvis listed as an input here instead of in
|
|
@@ -145,11 +145,13 @@ group("absl_component_deps") {
|
|
}
|
|
|
|
# Abseil testing utilities should only be included in test binaries.
|
|
+if (!moz_webrtc_build) {
|
|
source_set("test_support") {
|
|
testonly = true
|
|
public_deps = [ "//third_party/abseil-cpp/absl/hash:hash_testing" ]
|
|
deps = [ ":absl" ]
|
|
}
|
|
+}
|
|
|
|
# Some third-party libraries use additional parts of absl that are banned in
|
|
# Chrome (e.g. flags generates static initializers that are undesirable in
|
|
@@ -184,6 +186,7 @@ source_set("absl_full") {
|
|
}
|
|
|
|
group("absl_full_deps") {
|
|
+ if (!moz_webrtc_build) {
|
|
public_deps = [
|
|
# Banned because each flag registration generates a static initializer, and
|
|
# the flag registration mechanism is problematic in component builds.
|
|
@@ -206,6 +209,7 @@ group("absl_full_deps") {
|
|
]
|
|
|
|
public_configs = [ "//third_party/abseil-cpp/absl/flags:absl_flags_config" ]
|
|
+ }
|
|
}
|
|
|
|
config("absl_include_config") {
|