0004.patch (3570B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Thu, 10 Oct 2024 13:42:00 +0000 3 Subject: Bug 1921707 - abseil-cpp preprocessor, .json, .gni, and *.gn changes 4 r=ng 5 6 Differential Revision: https://phabricator.services.mozilla.com/D224077 7 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/6207cac8e337488d54927a5a09e574afec9b432d 8 --- 9 abseil-cpp/.gn | 10 ++++++++++ 10 abseil-cpp/absl.gni | 15 ++++++++------- 11 abseil-cpp/absl/random/internal/BUILD.gn | 2 ++ 12 3 files changed, 20 insertions(+), 7 deletions(-) 13 create mode 100644 abseil-cpp/.gn 14 15 diff --git a/abseil-cpp/.gn b/abseil-cpp/.gn 16 new file mode 100644 17 index 00000000000..648423a128f 18 --- /dev/null 19 +++ b/abseil-cpp/.gn 20 @@ -0,0 +1,10 @@ 21 +# The location of the build configuration file. 22 +buildconfig = "//build/config/BUILDCONFIG.gn" 23 +script_executable = "python3" 24 +secondary_source = "//abseil-cpp/" 25 + 26 +default_args = { 27 +use_custom_libcxx = false 28 +is_component_build = false 29 +} 30 + 31 diff --git a/abseil-cpp/absl.gni b/abseil-cpp/absl.gni 32 index b19ac75675a..ff2ff91cfa4 100644 33 --- a/abseil-cpp/absl.gni 34 +++ b/abseil-cpp/absl.gni 35 @@ -34,8 +34,8 @@ template("absl_source_set") { 36 configs += [ 37 "//build/config/compiler:no_chromium_code", 38 "//build/config/compiler:prevent_unsafe_narrowing", 39 - "//third_party/abseil-cpp:absl_default_cflags_cc", 40 - "//third_party/abseil-cpp:absl_define_config", 41 + "//abseil-cpp:absl_default_cflags_cc", 42 + "//abseil-cpp:absl_define_config", 43 ] 44 45 if (!defined(defines)) { 46 @@ -52,7 +52,7 @@ template("absl_source_set") { 47 if (!defined(public_configs)) { 48 public_configs = [] 49 } 50 - public_configs += [ "//third_party/abseil-cpp:absl_include_config" ] 51 + public_configs += [ "//abseil-cpp:absl_include_config" ] 52 53 if (!defined(visibility)) { 54 # Within Chromium builds, restrict direct visibility of Abseil sources, so 55 @@ -80,6 +80,7 @@ template("absl_source_set") { 56 } 57 } 58 } 59 + visibility += [ "//abseil-cpp/*" ] 60 } 61 } 62 63 @@ -93,15 +94,15 @@ template("absl_test") { 64 configs -= [ "//build/config/compiler:chromium_code" ] 65 configs += [ 66 "//build/config/compiler:no_chromium_code", 67 - "//third_party/abseil-cpp:absl_default_cflags_cc", 68 - "//third_party/abseil-cpp:absl_define_config", 69 - "//third_party/abseil-cpp:absl_test_config", 70 + "//abseil-cpp:absl_default_cflags_cc", 71 + "//abseil-cpp:absl_define_config", 72 + "//abseil-cpp:absl_test_config", 73 ] 74 75 if (!defined(public_configs)) { 76 public_configs = [] 77 } 78 - public_configs += [ "//third_party/abseil-cpp:absl_include_config" ] 79 + public_configs += [ "//abseil-cpp:absl_include_config" ] 80 81 visibility = [ "//third_party/abseil-cpp/:*" ] 82 deps += [ 83 diff --git a/abseil-cpp/absl/random/internal/BUILD.gn b/abseil-cpp/absl/random/internal/BUILD.gn 84 index 46dcff5a887..2aef8a1aa9d 100644 85 --- a/abseil-cpp/absl/random/internal/BUILD.gn 86 +++ b/abseil-cpp/absl/random/internal/BUILD.gn 87 @@ -242,6 +242,7 @@ absl_source_set("randen_hwaes_impl") { 88 visibility = [ "//third_party/abseil-cpp/absl/random/*" ] 89 } 90 91 +if (!moz_webrtc_build) { 92 executable("gaussian_distribution_gentables") { 93 sources = [ "gaussian_distribution_gentables.cc" ] 94 deps = [ 95 @@ -250,6 +251,7 @@ executable("gaussian_distribution_gentables") { 96 ] 97 visibility = [ "//third_party/abseil-cpp/absl/random/*" ] 98 } 99 +} 100 101 absl_source_set("distribution_test_util") { 102 testonly = true