File: s0102.patch

package info (click to toggle)
firefox 147.0.2-1
links: PTS, VCS
area: main
in suites: sid
size: 4,683,484 kB
sloc: cpp: 7,607,246; javascript: 6,533,185; ansic: 3,775,227; python: 1,415,393; xml: 634,561; asm: 438,951; java: 186,241; sh: 62,752; makefile: 18,079; objc: 13,092; perl: 12,808; yacc: 4,583; cs: 3,846; pascal: 3,448; lex: 1,720; ruby: 1,003; php: 436; lisp: 258; awk: 247; sql: 66; sed: 54; csh: 10; exp: 6
file content (874 lines) | stat: -rw-r--r-- 31,960 bytes
From: Michael Froman <mfroman@mozilla.com>
Date: Thu, 10 Oct 2024 13:42:00 +0000
Subject: Bug 1921707 - point to new build directory location in
 third_party/libwebrtc r=ng,webrtc-reviewers

Ran:
ack -l "\"//build/config" third_party/libwebrtc | xargs sed -i.bak -E 's/\"\/\/build\/config/\"\/\/chromium\/build\/config/'
ack -l "\"//build/dot" third_party/libwebrtc | xargs sed -i.bak -E 's/\"\/\/build\/dot/\"\/\/chromium\/build\/dot/'
ack -l "\"//build/mac" third_party/libwebrtc | xargs sed -i.bak -E 's/\"\/\/build\/mac/\"\/\/chromium\/build\/mac/'
find third_party -name "*.bak" | xargs rm
hg revert third_party/libwebrtc/moz-patch-stack

Differential Revision: https://phabricator.services.mozilla.com/D224543
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/a342f5eca8622c8b918d6119f74aff96cc8cf582
---
 .gn                                           |  4 +--
 BUILD.gn                                      | 14 +++++-----
 api/BUILD.gn                                  |  4 +--
 api/audio/test/BUILD.gn                       |  4 +--
 api/audio_codecs/BUILD.gn                     |  4 +--
 api/audio_codecs/L16/BUILD.gn                 |  4 +--
 api/audio_codecs/g711/BUILD.gn                |  4 +--
 api/audio_codecs/g722/BUILD.gn                |  4 +--
 api/audio_codecs/opus/BUILD.gn                |  4 +--
 api/audio_codecs/test/BUILD.gn                |  4 +--
 api/video/BUILD.gn                            |  4 +--
 api/video_codecs/BUILD.gn                     |  4 +--
 audio/BUILD.gn                                |  4 +--
 common_audio/BUILD.gn                         |  4 +--
 common_audio/third_party/ooura/BUILD.gn       |  2 +-
 examples/BUILD.gn                             | 14 +++++-----
 .../androidapp/third_party/autobanh/BUILD.gn  |  2 +-
 examples/androidnativeapi/BUILD.gn            |  4 +--
 examples/androidvoip/BUILD.gn                 |  4 +--
 logging/BUILD.gn                              |  4 +--
 media/BUILD.gn                                |  2 +-
 modules/audio_device/BUILD.gn                 |  4 +--
 modules/audio_processing/aec3/BUILD.gn        |  2 +-
 modules/audio_processing/aecm/BUILD.gn        |  2 +-
 modules/audio_processing/agc/BUILD.gn         |  2 +-
 modules/audio_processing/agc2/BUILD.gn        |  2 +-
 .../audio_processing/agc2/rnn_vad/BUILD.gn    |  8 +++---
 modules/audio_processing/ns/BUILD.gn          |  2 +-
 modules/desktop_capture/BUILD.gn              |  4 +--
 modules/portal/BUILD.gn                       |  2 +-
 modules/video_coding/BUILD.gn                 |  2 +-
 pc/BUILD.gn                                   |  4 +--
 rtc_base/BUILD.gn                             |  8 +++---
 rtc_base/memory/BUILD.gn                      |  4 +--
 rtc_base/synchronization/BUILD.gn             |  4 +--
 rtc_base/system/BUILD.gn                      |  4 +--
 rtc_tools/network_tester/BUILD.gn             |  4 +--
 sdk/BUILD.gn                                  | 12 ++++----
 system_wrappers/BUILD.gn                      |  4 +--
 test/BUILD.gn                                 |  6 ++--
 test/fuzzers/BUILD.gn                         |  4 +--
 webrtc.gni                                    | 28 +++++++++----------
 42 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/.gn b/.gn
index 4df8681a9b..269ca2f5a7 100644
--- a/.gn
+++ b/.gn
@@ -6,10 +6,10 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-import("//build/dotfile_settings.gni")
+import("//chromium/build/dotfile_settings.gni")
 
 # The location of the build configuration file.
-buildconfig = "//build/config/BUILDCONFIG.gn"
+buildconfig = "//chromium/build/config/BUILDCONFIG.gn"
 
 # The python interpreter to use by default. On Windows, this will look
 # for vpython3.exe and vpython3.bat.
diff --git a/BUILD.gn b/BUILD.gn
index 771e0b196a..7e1e8353ab 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -21,15 +21,15 @@
 # - visibility = [ ":*" ] - directory private.
 # As a general guideline, only targets in api/ should have public visibility.
 
-import("//build/config/linux/pkg_config.gni")
-import("//build/config/sanitizers/sanitizers.gni")
+import("//chromium/build/config/linux/pkg_config.gni")
+import("//chromium/build/config/sanitizers/sanitizers.gni")
 import("webrtc.gni")
 if (rtc_enable_protobuf) {
   import("//third_party/protobuf/proto_library.gni")
 }
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
   import("//third_party/jni_zero/jni_zero.gni")
 }
 
@@ -540,7 +540,7 @@ if (!build_with_chromium) {
     sources = []
 
     complete_static_lib = true
-    suppressed_configs += [ "//build/config/compiler:thin_archive" ]
+    suppressed_configs += [ "//chromium/build/config/compiler:thin_archive" ]
     defines = []
 
     deps = [
@@ -857,7 +857,7 @@ rtc_static_library("dcsctp") {
   visibility = [ "//:default" ]
   sources = []
   complete_static_lib = true
-  suppressed_configs += [ "//build/config/compiler:thin_archive" ]
+  suppressed_configs += [ "//chromium/build/config/compiler:thin_archive" ]
   defines = []
   deps = [
     "net/dcsctp/public:factory",
@@ -892,7 +892,7 @@ group("poison_software_video_codecs") {
 if (!build_with_chromium) {
   # Write debug logs to gn_logs.txt.
   # This is also required for Siso builds.
-  import("//build/gn_logs.gni")
+  import("//chromium/build/gn_logs.gni")
   lines = [
             "Generated during 'gn gen' by //BUILD.gn.",
             "",
diff --git a/api/BUILD.gn b/api/BUILD.gn
index 0a99f22d21..7ab24eafb1 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 group("api") {
diff --git a/api/audio/test/BUILD.gn b/api/audio/test/BUILD.gn
index b1060faae3..c567b6b0f3 100644
--- a/api/audio/test/BUILD.gn
+++ b/api/audio/test/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 if (rtc_include_tests) {
diff --git a/api/audio_codecs/BUILD.gn b/api/audio_codecs/BUILD.gn
index 25ea12557b..aca296a06c 100644
--- a/api/audio_codecs/BUILD.gn
+++ b/api/audio_codecs/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("audio_codecs_api") {
diff --git a/api/audio_codecs/L16/BUILD.gn b/api/audio_codecs/L16/BUILD.gn
index 8ce7122cec..b7ec211eaf 100644
--- a/api/audio_codecs/L16/BUILD.gn
+++ b/api/audio_codecs/L16/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("audio_encoder_L16") {
diff --git a/api/audio_codecs/g711/BUILD.gn b/api/audio_codecs/g711/BUILD.gn
index 6c00e040fe..380e167dc6 100644
--- a/api/audio_codecs/g711/BUILD.gn
+++ b/api/audio_codecs/g711/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("audio_encoder_g711") {
diff --git a/api/audio_codecs/g722/BUILD.gn b/api/audio_codecs/g722/BUILD.gn
index a3ee0d4e0c..322c52ac64 100644
--- a/api/audio_codecs/g722/BUILD.gn
+++ b/api/audio_codecs/g722/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_source_set("audio_encoder_g722_config") {
diff --git a/api/audio_codecs/opus/BUILD.gn b/api/audio_codecs/opus/BUILD.gn
index 6df8361dbb..a86f34a973 100644
--- a/api/audio_codecs/opus/BUILD.gn
+++ b/api/audio_codecs/opus/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("audio_encoder_opus_config") {
diff --git a/api/audio_codecs/test/BUILD.gn b/api/audio_codecs/test/BUILD.gn
index 40714b196e..2c6b39f59e 100644
--- a/api/audio_codecs/test/BUILD.gn
+++ b/api/audio_codecs/test/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 if (rtc_include_tests) {
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 14cf3604b4..b162e7da27 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("video_rtp_headers") {
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index c6040740ce..70ed476401 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("scalability_mode") {
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index eda3161da8..612028625a 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("audio") {
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index a95c90df2c..3ac5126100 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -290,7 +290,7 @@ if (rtc_build_with_neon) {
 
     if (target_cpu != "arm64") {
       # Enable compilation for the NEON instruction set.
-      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
       cflags = [ "-mfpu=neon" ]
     }
 
@@ -313,7 +313,7 @@ if (rtc_build_with_neon) {
 
     if (target_cpu != "arm64") {
       # Enable compilation for the NEON instruction set.
-      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
       cflags = [ "-mfpu=neon" ]
     }
 
diff --git a/common_audio/third_party/ooura/BUILD.gn b/common_audio/third_party/ooura/BUILD.gn
index 589142b014..2ee80ded55 100644
--- a/common_audio/third_party/ooura/BUILD.gn
+++ b/common_audio/third_party/ooura/BUILD.gn
@@ -40,7 +40,7 @@ rtc_library("fft_size_128") {
 
     if (target_cpu != "arm64") {
       # Enable compilation for the NEON instruction set.
-      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
       cflags += [ "-mfpu=neon" ]
     }
   }
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index c8000c3c12..7a77610e07 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -9,15 +9,15 @@
 import("../webrtc.gni")
 
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
   import("//third_party/jni_zero/jni_zero.gni")
 } else if (is_mac) {
-  import("//build/config/mac/rules.gni")
+  import("//chromium/build/config/mac/rules.gni")
 } else if (is_ios) {
-  import("//build/config/ios/rules.gni")
+  import("//chromium/build/config/ios/rules.gni")
 } else if (is_linux || is_chromeos) {
-  import("//build/config/linux/pkg_config.gni")
+  import("//chromium/build/config/linux/pkg_config.gni")
 }
 
 group("examples") {
@@ -630,7 +630,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
           "../sdk:mediaconstraints_objc",
           "../sdk:peerconnectionfactory_base_objc",
           "../sdk:videocapture_objc",
-          "//build/config/ios:xctest",
+          "//chromium/build/config/ios:xctest",
           "//third_party/ocmock",
         ]
       }
@@ -735,7 +735,7 @@ if (is_linux || is_chromeos || is_win) {
         "peerconnection/client/main_wnd.cc",
         "peerconnection/client/main_wnd.h",
       ]
-      configs += [ "//build/config/win:windowed" ]
+      configs += [ "//chromium/build/config/win:windowed" ]
       deps += [
         "../rtc_base:win32",
         "../rtc_base:win32_socket_init",
diff --git a/examples/androidapp/third_party/autobanh/BUILD.gn b/examples/androidapp/third_party/autobanh/BUILD.gn
index b671239bae..e545b2cde3 100644
--- a/examples/androidapp/third_party/autobanh/BUILD.gn
+++ b/examples/androidapp/third_party/autobanh/BUILD.gn
@@ -7,7 +7,7 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 if (is_android) {
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/rules.gni")
 
   android_java_prebuilt("autobanh_java") {
     jar_path = "lib/autobanh.jar"
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 26d136a1d8..1b3d2f3884 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -41,8 +41,8 @@ if (is_android) {
       "jni/onload.cc",
     ]
 
-    suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
-    configs += [ "//build/config/android:hide_all_but_jni" ]
+    suppressed_configs += [ "//chromium/build/config/android:hide_all_but_jni_onload" ]
+    configs += [ "//chromium/build/config/android:hide_all_but_jni" ]
 
     deps = [
       ":generated_jni",
diff --git a/examples/androidvoip/BUILD.gn b/examples/androidvoip/BUILD.gn
index af82ba39db..2306fe1886 100644
--- a/examples/androidvoip/BUILD.gn
+++ b/examples/androidvoip/BUILD.gn
@@ -50,8 +50,8 @@ if (is_android) {
       "jni/onload.cc",
     ]
 
-    suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
-    configs += [ "//build/config/android:hide_all_but_jni" ]
+    suppressed_configs += [ "//chromium/build/config/android:hide_all_but_jni_onload" ]
+    configs += [ "//chromium/build/config/android:hide_all_but_jni" ]
 
     deps = [
       ":generated_jni",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 401dca948a..cadd4bab1b 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -11,8 +11,8 @@ if (rtc_enable_protobuf) {
   import("//third_party/protobuf/proto_library.gni")
 }
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 group("logging") {
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 6896edbc34..ecbb7eae7e 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -6,7 +6,7 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-import("//build/config/linux/pkg_config.gni")
+import("//chromium/build/config/linux/pkg_config.gni")
 import("//libwebrtc/third_party/libaom/options.gni")
 import("../webrtc.gni")
 
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index e57e55882c..80af18a5fa 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -9,8 +9,8 @@
 import("../../webrtc.gni")
 
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 config("audio_device_warnings_config") {
diff --git a/modules/audio_processing/aec3/BUILD.gn b/modules/audio_processing/aec3/BUILD.gn
index 847e5ccbea..2f6be208d2 100644
--- a/modules/audio_processing/aec3/BUILD.gn
+++ b/modules/audio_processing/aec3/BUILD.gn
@@ -124,7 +124,7 @@ rtc_library("aec3") {
 
   defines = []
   if (rtc_build_with_neon && target_cpu != "arm64") {
-    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
     cflags = [ "-mfpu=neon" ]
   }
 
diff --git a/modules/audio_processing/aecm/BUILD.gn b/modules/audio_processing/aecm/BUILD.gn
index f01637f2da..d5bdc070be 100644
--- a/modules/audio_processing/aecm/BUILD.gn
+++ b/modules/audio_processing/aecm/BUILD.gn
@@ -30,7 +30,7 @@ rtc_library("aecm_core") {
 
     if (target_cpu != "arm64") {
       # Enable compilation for the NEON instruction set.
-      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
       cflags += [ "-mfpu=neon" ]
     }
   }
diff --git a/modules/audio_processing/agc/BUILD.gn b/modules/audio_processing/agc/BUILD.gn
index 45d08ad066..2d6f3ca0b4 100644
--- a/modules/audio_processing/agc/BUILD.gn
+++ b/modules/audio_processing/agc/BUILD.gn
@@ -86,7 +86,7 @@ rtc_library("legacy_agc") {
   if (rtc_build_with_neon) {
     if (target_cpu != "arm64") {
       # Enable compilation for the NEON instruction set.
-      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
       cflags = [ "-mfpu=neon" ]
     }
   }
diff --git a/modules/audio_processing/agc2/BUILD.gn b/modules/audio_processing/agc2/BUILD.gn
index 83f8889fff..54fcde3a18 100644
--- a/modules/audio_processing/agc2/BUILD.gn
+++ b/modules/audio_processing/agc2/BUILD.gn
@@ -258,7 +258,7 @@ rtc_library("vad_wrapper") {
 
   defines = []
   if (rtc_build_with_neon && current_cpu != "arm64") {
-    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
     cflags = [ "-mfpu=neon" ]
   }
 
diff --git a/modules/audio_processing/agc2/rnn_vad/BUILD.gn b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
index 0fb06b2a86..6ce62e7818 100644
--- a/modules/audio_processing/agc2/rnn_vad/BUILD.gn
+++ b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
@@ -19,7 +19,7 @@ rtc_library("rnn_vad") {
 
   defines = []
   if (rtc_build_with_neon && target_cpu != "arm64") {
-    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
     cflags = [ "-mfpu=neon" ]
   }
 
@@ -87,7 +87,7 @@ rtc_library("rnn_vad_layers") {
 
   defines = []
   if (rtc_build_with_neon && current_cpu != "arm64") {
-    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
     cflags = [ "-mfpu=neon" ]
   }
 
@@ -148,7 +148,7 @@ rtc_library("rnn_vad_pitch") {
 
   defines = []
   if (rtc_build_with_neon && current_cpu != "arm64") {
-    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
     cflags = [ "-mfpu=neon" ]
   }
 
@@ -271,7 +271,7 @@ if (rtc_include_tests) {
 
     defines = []
     if (rtc_build_with_neon && current_cpu != "arm64") {
-      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
       cflags = [ "-mfpu=neon" ]
     }
 
diff --git a/modules/audio_processing/ns/BUILD.gn b/modules/audio_processing/ns/BUILD.gn
index 0e96125f40..c72b3714c4 100644
--- a/modules/audio_processing/ns/BUILD.gn
+++ b/modules/audio_processing/ns/BUILD.gn
@@ -44,7 +44,7 @@ rtc_static_library("ns") {
 
   defines = []
   if (rtc_build_with_neon && target_cpu != "arm64") {
-    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    suppressed_configs += [ "//chromium/build/config/compiler:compiler_arm_fpu" ]
     cflags = [ "-mfpu=neon" ]
   }
 
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index b4860feadb..651ea6ac51 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -6,8 +6,8 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-import("//build/config/linux/gtk/gtk.gni")
-import("//build/config/ui.gni")
+import("//chromium/build/config/linux/gtk/gtk.gni")
+import("//chromium/build/config/ui.gni")
 import("../../webrtc.gni")
 
 use_desktop_capture_differ_sse2 = target_cpu == "x86" || target_cpu == "x64"
diff --git a/modules/portal/BUILD.gn b/modules/portal/BUILD.gn
index a693604389..72972d18e1 100644
--- a/modules/portal/BUILD.gn
+++ b/modules/portal/BUILD.gn
@@ -6,7 +6,7 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-import("//build/config/linux/pkg_config.gni")
+import("//chromium/build/config/linux/pkg_config.gni")
 import("//tools/generate_stubs/rules.gni")
 import("../../webrtc.gni")
 
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index b7561e53b6..fe7eb57423 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -6,7 +6,7 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-import("//build/config/linux/pkg_config.gni")
+import("//chromium/build/config/linux/pkg_config.gni")
 import("//libwebrtc/third_party/libaom/options.gni")
 import("../../webrtc.gni")
 
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 696829d6ca..81bd2a6215 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -30,8 +30,8 @@
 
 import("../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 if (rtc_build_libsrtp) {
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index ec8f58e606..aa626933d5 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -9,8 +9,8 @@
 import("../webrtc.gni")
 
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_source_set("protobuf_utils") {
@@ -1919,8 +1919,8 @@ if (!rtc_rusty_base64) {
     ]
   }
 } else {
-  import("//build/config/rust.gni")
-  import("//build/rust/rust_static_library.gni")
+  import("//chromium/build/config/rust.gni")
+  import("//chromium/build/rust/rust_static_library.gni")
 
   rust_static_library("base64_rust_bridge") {
     allow_unsafe = true  # Needed for FFI with cxx crate.
diff --git a/rtc_base/memory/BUILD.gn b/rtc_base/memory/BUILD.gn
index 9a55af3ea9..3d272ba975 100644
--- a/rtc_base/memory/BUILD.gn
+++ b/rtc_base/memory/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("aligned_malloc") {
diff --git a/rtc_base/synchronization/BUILD.gn b/rtc_base/synchronization/BUILD.gn
index 2a197152b9..4d5008874e 100644
--- a/rtc_base/synchronization/BUILD.gn
+++ b/rtc_base/synchronization/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_library("yield") {
diff --git a/rtc_base/system/BUILD.gn b/rtc_base/system/BUILD.gn
index 4a772795ed..de27f01bb0 100644
--- a/rtc_base/system/BUILD.gn
+++ b/rtc_base/system/BUILD.gn
@@ -8,8 +8,8 @@
 
 import("../../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 rtc_source_set("arch") {
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 082a11f47c..2e8f069f24 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -180,8 +180,8 @@ if (is_android) {
       "../../rtc_base:threading",
     ]
 
-    suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
-    configs += [ "//build/config/android:hide_all_but_jni" ]
+    suppressed_configs += [ "//chromium/build/config/android:hide_all_but_jni_onload" ]
+    configs += [ "//chromium/build/config/android:hide_all_but_jni" ]
 
     output_extension = "so"
   }
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 90389a59fc..b430795605 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -9,12 +9,12 @@
 import("//third_party/libaom/options.gni")
 import("../webrtc.gni")
 if (is_ios) {
-  import("//build/config/apple/mobile_config.gni")
-  import("//build/config/ios/ios_sdk.gni")
-  import("//build/config/ios/rules.gni")
+  import("//chromium/build/config/apple/mobile_config.gni")
+  import("//chromium/build/config/ios/ios_sdk.gni")
+  import("//chromium/build/config/ios/rules.gni")
 }
 if (is_mac) {
-  import("//build/config/mac/rules.gni")
+  import("//chromium/build/config/mac/rules.gni")
 }
 
 group("sdk") {
@@ -67,7 +67,7 @@ if (is_ios || is_mac) {
     ]
 
     if (use_clang_coverage) {
-      configs = [ "//build/config/coverage:default_coverage" ]
+      configs = [ "//chromium/build/config/coverage:default_coverage" ]
     }
   }
 
@@ -1281,7 +1281,7 @@ if (is_ios || is_mac) {
           }
 
           public_deps = [
-            "//build/config/ios:xctest",
+            "//chromium/build/config/ios:xctest",
             "//third_party/ocmock",
           ]
         }
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
index 822b565610..f2ea548824 100644
--- a/system_wrappers/BUILD.gn
+++ b/system_wrappers/BUILD.gn
@@ -7,8 +7,8 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 import("../webrtc.gni")
 
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 9981ae4d80..9abf24e919 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -6,10 +6,10 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-import("//build/config/ui.gni")
+import("//chromium/build/config/ui.gni")
 import("../webrtc.gni")
 if (is_android) {
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/rules.gni")
   import("//third_party/jni_zero/jni_zero.gni")
 }
 
@@ -436,7 +436,7 @@ if (is_ios && !build_with_chromium) {
     testonly = true
     visibility = [ "*" ]
     sources = [ "ios/google_test_runner.mm" ]
-    configs += [ "//build/config/ios:xctest_config" ]
+    configs += [ "//chromium/build/config/ios:xctest_config" ]
     frameworks = [ "UIKit.framework" ]
     deps = [ ":google_test_runner_delegate" ]
   }
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 0271277265..a9117c962d 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -6,7 +6,7 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-import("//build/config/features.gni")
+import("//chromium/build/config/features.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("../../webrtc.gni")
 
@@ -78,7 +78,7 @@ template("webrtc_fuzzer_test") {
     }
 
     if (!build_with_chromium && is_clang) {
-      suppressed_configs = [ "//build/config/clang:find_bad_constructs" ]
+      suppressed_configs = [ "//chromium/build/config/clang:find_bad_constructs" ]
     }
   }
 }
diff --git a/webrtc.gni b/webrtc.gni
index 87ce405e1c..6d303397f3 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -5,12 +5,12 @@
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
-import("//build/config/arm.gni")
-import("//build/config/features.gni")
-import("//build/config/mips.gni")
-import("//build/config/ozone.gni")
-import("//build/config/sanitizers/sanitizers.gni")
-import("//build/config/sysroot.gni")
+import("//chromium/build/config/arm.gni")
+import("//chromium/build/config/features.gni")
+import("//chromium/build/config/mips.gni")
+import("//chromium/build/config/ozone.gni")
+import("//chromium/build/config/sanitizers/sanitizers.gni")
+import("//chromium/build/config/sysroot.gni")
 import("//build_overrides/build.gni")
 
 if (!build_with_chromium && is_component_build) {
@@ -28,20 +28,20 @@ if (!build_with_chromium && is_component_build) {
 }
 
 if (is_ios) {
-  import("//build/config/ios/rules.gni")
+  import("//chromium/build/config/ios/rules.gni")
 }
 
 if (is_mac) {
-  import("//build/config/mac/rules.gni")
+  import("//chromium/build/config/mac/rules.gni")
 }
 
 if (is_android) {
-  import("//build/config/android/config.gni")
-  import("//build/config/android/rules.gni")
+  import("//chromium/build/config/android/config.gni")
+  import("//chromium/build/config/android/rules.gni")
 }
 
 if (is_fuchsia) {
-  import("//build/config/fuchsia/config.gni")
+  import("//chromium/build/config/fuchsia/config.gni")
 }
 
 if (build_with_chromium) {
@@ -372,8 +372,8 @@ rtc_common_configs = [ webrtc_root + ":common_config" ]
 
 if (is_mac || is_ios) {
   if (filter_include(default_compiler_configs,
-                     [ "//build/config/compiler:enable_arc" ]) == []) {
-    rtc_common_configs += [ "//build/config/compiler:enable_arc" ]
+                     [ "//chromium/build/config/compiler:enable_arc" ]) == []) {
+    rtc_common_configs += [ "//chromium/build/config/compiler:enable_arc" ]
   }
 }
 
@@ -391,7 +391,7 @@ rtc_common_inherited_config = webrtc_root + ":common_inherited_config"
 # Common configs to remove or add in all rtc targets.
 rtc_remove_configs = []
 if (!build_with_chromium && is_clang) {
-  rtc_remove_configs += [ "//build/config/clang:find_bad_constructs" ]
+  rtc_remove_configs += [ "//chromium/build/config/clang:find_bad_constructs" ]
 }
 rtc_add_configs = rtc_common_configs
 rtc_prod_configs = [ webrtc_root + ":rtc_prod_config" ]