1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
From: Michael Froman <mfroman@mozilla.com>
Date: Tue, 7 Jan 2025 15:30:00 -0600
Subject: Bug 1935474 - BUILD.gn changes to allow building all of
absl_component_deps. r?ng!
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/9cf7afd94407318bb1c39b801d3523db532232e1
---
abseil-cpp/BUILD.gn | 31 ++++++++++--------------
abseil-cpp/absl/random/internal/BUILD.gn | 5 ++++
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/abseil-cpp/BUILD.gn b/abseil-cpp/BUILD.gn
index 49b4cb7f92b..1949a635ca1 100644
--- a/abseil-cpp/BUILD.gn
+++ b/abseil-cpp/BUILD.gn
@@ -56,7 +56,6 @@ component("absl") {
}
group("absl_component_deps") {
- if (false) {
public_deps = [
"//third_party/abseil-cpp/absl/algorithm",
"//third_party/abseil-cpp/absl/algorithm:container",
@@ -126,23 +125,6 @@ group("absl_component_deps") {
# absl internal utilities used by protobuf.
"//third_party/abseil-cpp/absl/container:layout",
]
- } else {
- public_deps = [
- "//abseil-cpp/absl/algorithm:container",
- "//abseil-cpp/absl/base:nullability",
- "//abseil-cpp/absl/cleanup",
- "//abseil-cpp/absl/container:inlined_vector",
- "//abseil-cpp/absl/functional:any_invocable",
- "//abseil-cpp/absl/functional:bind_front",
- "//abseil-cpp/absl/strings",
- "//abseil-cpp/absl/strings:str_format",
- "//abseil-cpp/absl/strings:string_view",
- "//abseil-cpp/absl/types:optional",
- "//abseil-cpp/absl/types:span",
- "//abseil-cpp/absl/types:variant",
- "//abseil-cpp/absl/utility",
- ]
- }
if (is_component_build) {
public_deps += [ ":absl_full_deps" ]
@@ -156,6 +138,19 @@ group("absl_component_deps") {
}
visibility = [ ":absl" ]
+
+ if (moz_webrtc_build) {
+ # rewrite deps for our new abseil-cpp location
+ if (defined(public_deps)) {
+ modified_deps = []
+ foreach (dep, public_deps) {
+ newdep = string_replace(dep, "//third_party/abseil-cpp/", "//")
+ modified_deps += [ newdep ]
+ }
+ public_deps = []
+ public_deps = modified_deps
+ }
+ }
}
# Some third-party libraries use additional parts of absl that are banned in
diff --git a/abseil-cpp/absl/random/internal/BUILD.gn b/abseil-cpp/absl/random/internal/BUILD.gn
index 2aef8a1aa9d..08caf30bf0b 100644
--- a/abseil-cpp/absl/random/internal/BUILD.gn
+++ b/abseil-cpp/absl/random/internal/BUILD.gn
@@ -186,6 +186,11 @@ absl_source_set("platform") {
"//third_party/abseil-cpp/absl/base:config",
]
visibility = [ "//third_party/abseil-cpp/absl/random/*" ]
+
+ if (moz_webrtc_build) {
+ # We don't really want to run Google's scripting to generate build flags
+ deps -= [ "//build:chromeos_buildflags" ]
+ }
}
absl_source_set("randen") {
|
