0006.patch (4377B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Thu, 10 Oct 2024 13:42:00 +0000 3 Subject: Bug 1921707 - point to new build directory location in 4 third_party/abseil-cpp r=ng 5 6 Ran: 7 ack -l "\"//build/config" third_party/abseil-cpp | xargs sed -i.bak -E 's/\"\/\/build\/config/\"\/\/chromium\/build\/config/' 8 ack -l "\"//build/toolchain" third_party/abseil-cpp | xargs sed -i.bak -E 's/\"\/\/build\/toolchain/\"\/\/chromium\/build\/toolchain/' 9 find third_party -name "*.bak" | xargs rm 10 11 Differential Revision: https://phabricator.services.mozilla.com/D224544 12 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/566543823f7e89dc33d6d59a438aea7a1d19e3b0 13 --- 14 abseil-cpp/.gn | 2 +- 15 abseil-cpp/BUILD.gn | 8 ++++---- 16 abseil-cpp/absl.gni | 14 +++++++------- 17 abseil-cpp/absl/debugging/BUILD.gn | 2 +- 18 4 files changed, 13 insertions(+), 13 deletions(-) 19 20 diff --git a/abseil-cpp/.gn b/abseil-cpp/.gn 21 index 648423a128f..bd6c38b3762 100644 22 --- a/abseil-cpp/.gn 23 +++ b/abseil-cpp/.gn 24 @@ -1,5 +1,5 @@ 25 # The location of the build configuration file. 26 -buildconfig = "//build/config/BUILDCONFIG.gn" 27 +buildconfig = "//chromium/build/config/BUILDCONFIG.gn" 28 script_executable = "python3" 29 secondary_source = "//abseil-cpp/" 30 31 diff --git a/abseil-cpp/BUILD.gn b/abseil-cpp/BUILD.gn 32 index 97b460e4fd4..ef837cb908a 100644 33 --- a/abseil-cpp/BUILD.gn 34 +++ b/abseil-cpp/BUILD.gn 35 @@ -6,10 +6,10 @@ 36 # opts will be linked together, and in some cases headers compiled with and 37 # without these options will be part of the same program. 38 39 -import("//build/config/c++/c++.gni") 40 -import("//build/config/nacl/config.gni") 41 -import("//build/config/sanitizers/sanitizers.gni") 42 -import("//build/toolchain/toolchain.gni") 43 +import("//chromium/build/config/c++/c++.gni") 44 +import("//chromium/build/config/nacl/config.gni") 45 +import("//chromium/build/config/sanitizers/sanitizers.gni") 46 +import("//chromium/build/toolchain/toolchain.gni") 47 import("//build_overrides/build.gni") 48 import("//third_party/abseil-cpp/absl.gni") 49 50 diff --git a/abseil-cpp/absl.gni b/abseil-cpp/absl.gni 51 index 1213d0e0bb0..06515e0e805 100644 52 --- a/abseil-cpp/absl.gni 53 +++ b/abseil-cpp/absl.gni 54 @@ -30,10 +30,10 @@ template("absl_source_set") { 55 not_needed(invoker, "*") 56 } else { 57 forward_variables_from(invoker, "*") 58 - configs -= [ "//build/config/compiler:chromium_code" ] 59 + configs -= [ "//chromium/build/config/compiler:chromium_code" ] 60 configs += [ 61 - "//build/config/compiler:no_chromium_code", 62 - "//build/config/compiler:prevent_unsafe_narrowing", 63 + "//chromium/build/config/compiler:no_chromium_code", 64 + "//chromium/build/config/compiler:prevent_unsafe_narrowing", 65 "//abseil-cpp:absl_default_cflags_cc", 66 "//abseil-cpp:absl_define_config", 67 ] 68 @@ -44,8 +44,8 @@ template("absl_source_set") { 69 if (is_component_build) { 70 defines += [ "ABSL_BUILD_DLL" ] 71 if (!is_win && current_os != "aix") { 72 - configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] 73 - configs += [ "//build/config/gcc:symbol_visibility_default" ] 74 + configs -= [ "//chromium/build/config/gcc:symbol_visibility_hidden" ] 75 + configs += [ "//chromium/build/config/gcc:symbol_visibility_default" ] 76 } 77 } 78 79 @@ -128,9 +128,9 @@ template("absl_test") { 80 } else { 81 forward_variables_from(invoker, "*") 82 testonly = true 83 - configs -= [ "//build/config/compiler:chromium_code" ] 84 + configs -= [ "//chromium/build/config/compiler:chromium_code" ] 85 configs += [ 86 - "//build/config/compiler:no_chromium_code", 87 + "//chromium/build/config/compiler:no_chromium_code", 88 "//abseil-cpp:absl_default_cflags_cc", 89 "//abseil-cpp:absl_define_config", 90 "//abseil-cpp:absl_test_config", 91 diff --git a/abseil-cpp/absl/debugging/BUILD.gn b/abseil-cpp/absl/debugging/BUILD.gn 92 index a1939b67793..9041c59ddad 100644 93 --- a/abseil-cpp/absl/debugging/BUILD.gn 94 +++ b/abseil-cpp/absl/debugging/BUILD.gn 95 @@ -2,7 +2,7 @@ 96 # Use of this source code is governed by a BSD-style license that can be 97 # found in the LICENSE file. 98 99 -import("//build/config/sanitizers/sanitizers.gni") 100 +import("//chromium/build/config/sanitizers/sanitizers.gni") 101 import("//third_party/abseil-cpp/absl.gni") 102 103 absl_source_set("stacktrace") {