0018.patch (398223B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Tue, 8 Jul 2025 12:33:20 -0500 3 Subject: Bug 1921707 - point to new build directory location in 4 third_party/chromium/build r=ng,glandium 5 6 Ran: 7 ack -l "\"//build/" third_party/chromium/build | xargs sed -i.bak -E 's/\"\/\/build\//\"\/\/chromium\/build\//' 8 ack -l "\"//build:" third_party/chromium/build | xargs sed -i.bak -E 's/\"\/\/build:/\"\/\/chromium\/build:/' 9 find third_party -name "*.bak" | xargs rm 10 hg revert \ 11 third_party/chromium/build/android/pylib/utils/gold_utils.py \ 12 third_party/chromium/build/args/README.txt \ 13 third_party/chromium/build/args/chromeos/README.md \ 14 third_party/chromium/build/gn_helpers_unittest.py \ 15 third_party/chromium/build/locale_tool.py \ 16 third_party/chromium/build/toolchain/linux/unbundle/README.md 17 18 Differential Revision: https://phabricator.services.mozilla.com/D224542 19 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/6b855a2bf6b1f3feb9c6558a9357fed8e43c5b99 20 --- 21 BUILD.gn | 16 +- 22 PRESUBMIT_test.py | 2 +- 23 android/BUILD.gn | 26 +- 24 android/DIR_METADATA | 2 +- 25 android/bytecode/BUILD.gn | 2 +- 26 android/gtest_apk/BUILD.gn | 2 +- 27 android/gyp/test/BUILD.gn | 2 +- 28 android/incremental_install/BUILD.gn | 2 +- 29 .../AndroidHiddenApiBypass/BUILD.gn | 4 +- 30 android/native_flags/BUILD.gn | 4 +- 31 android/pylib/device/commands/BUILD.gn | 2 +- 32 android/resource_sizes.gni | 6 +- 33 android/stacktrace/BUILD.gn | 2 +- 34 android/test/BUILD.gn | 14 +- 35 android/test/incremental_javac_gn/BUILD.gn | 4 +- 36 android/test/missing_symbol_test.gni | 6 +- 37 android/test/nocompile_gn/BUILD.gn | 8 +- 38 android/test_wrapper/logdog_wrapper.gni | 4 +- 39 android/unused_resources/BUILD.gn | 4 +- 40 apple/apple_info_plist.gni | 2 +- 41 apple/compile_entitlements.gni | 2 +- 42 apple/compile_plist.gni | 4 +- 43 apple/convert_plist.gni | 2 +- 44 apple/tweak_info_plist.gni | 8 +- 45 args/headless.gn | 2 +- 46 buildflag_header.gni | 4 +- 47 chromeos/crosier_tests.gni | 2 +- 48 chromeos/embed_sections.gni | 4 +- 49 cipd/cipd.gni | 2 +- 50 compiled_action.gni | 4 +- 51 config/BUILD.gn | 62 +-- 52 config/BUILDCONFIG.gn | 170 +++---- 53 config/aix/BUILD.gn | 4 +- 54 config/android/BUILD.gn | 14 +- 55 config/android/DIR_METADATA | 2 +- 56 config/android/abi.gni | 4 +- 57 config/android/android_nocompile.gni | 8 +- 58 config/android/build_vars.gni | 2 +- 59 config/android/config.gni | 18 +- 60 config/android/copy_ex.gni | 4 +- 61 config/android/create_unwind_table.gni | 4 +- 62 config/android/extract_unwind_tables.gni | 4 +- 63 config/android/internal_rules.gni | 104 ++-- 64 config/android/linker_version_script.gni | 6 +- 65 config/android/rules.gni | 126 ++--- 66 config/android/system_image.gni | 10 +- 67 config/android/test/proto/BUILD.gn | 2 +- 68 config/android/test/resource_overlay/BUILD.gn | 2 +- 69 config/apple/BUILD.gn | 2 +- 70 config/apple/create_signed_bundle.gni | 10 +- 71 config/apple/mobile_bundle_data.gni | 6 +- 72 config/apple/mobile_config.gni | 4 +- 73 config/apple/swift_source_set.gni | 2 +- 74 config/apple/symbols.gni | 4 +- 75 config/arm.gni | 4 +- 76 config/buildflags_paint_preview.gni | 4 +- 77 config/c++/BUILD.gn | 10 +- 78 config/c++/c++.gni | 6 +- 79 config/chromebox_for_meetings/BUILD.gn | 4 +- 80 config/chromecast/BUILD.gn | 2 +- 81 config/chromeos/BUILD.gn | 2 +- 82 config/chromeos/rules.gni | 38 +- 83 config/chromeos/ui_mode.gni | 2 +- 84 config/clang/BUILD.gn | 8 +- 85 config/clang/clang.gni | 10 +- 86 config/compiler/BUILD.gn | 122 ++--- 87 config/compiler/compiler.gni | 26 +- 88 config/compiler/pgo/BUILD.gn | 10 +- 89 config/compiler/pgo/pgo.gni | 14 +- 90 config/coverage/BUILD.gn | 8 +- 91 config/coverage/coverage.gni | 2 +- 92 config/cuttlefish/BUILD.gn | 4 +- 93 config/dcheck_always_on.gni | 2 +- 94 config/devtools.gni | 2 +- 95 config/features.gni | 4 +- 96 config/freetype/BUILD.gn | 6 +- 97 config/fuchsia/BUILD.gn | 10 +- 98 config/fuchsia/DIR_METADATA | 2 +- 99 config/fuchsia/generate_runner_scripts.gni | 16 +- 100 ...ackaged_content_embedder_excluded_dirs.gni | 2 +- 101 .../size_optimized_cast_receiver_args.gn | 2 +- 102 ...e_optimized_cast_receiver_args_internal.gn | 2 +- 103 config/fuchsia/sizes.gni | 6 +- 104 config/fuchsia/symbol_archive.gni | 2 +- 105 .../test/platform_video_codecs.shard.test-cml | 2 +- 106 .../fuchsia/test/test_ui_stack.shard.test-cml | 2 +- 107 .../fuchsia/test/web_instance.shard.test-cml | 12 +- 108 config/gcc/BUILD.gn | 12 +- 109 config/host_byteorder.gni | 2 +- 110 config/ios/BUILD.gn | 20 +- 111 config/ios/config.gni | 2 +- 112 config/ios/ios_sdk.gni | 12 +- 113 config/ios/ios_sdk_overrides.gni | 2 +- 114 config/ios/ios_test_runner_wrapper.gni | 8 +- 115 config/ios/ios_test_runner_xcuitest.gni | 4 +- 116 config/ios/rules.gni | 60 +-- 117 config/linux/BUILD.gn | 12 +- 118 config/linux/atk/BUILD.gn | 8 +- 119 config/linux/atspi2/BUILD.gn | 4 +- 120 config/linux/dbus/BUILD.gn | 6 +- 121 config/linux/dri/BUILD.gn | 2 +- 122 config/linux/gtk/BUILD.gn | 4 +- 123 config/linux/gtk/gtk.gni | 2 +- 124 config/linux/libdrm/BUILD.gn | 6 +- 125 config/linux/libffi/BUILD.gn | 4 +- 126 config/linux/libva/BUILD.gn | 2 +- 127 config/linux/nss/BUILD.gn | 2 +- 128 config/linux/pangocairo/BUILD.gn | 4 +- 129 config/linux/pangocairo/pangocairo.gni | 4 +- 130 config/linux/pkg_config.gni | 6 +- 131 config/locales.gni | 2 +- 132 config/logging.gni | 2 +- 133 config/loongarch64.gni | 2 +- 134 config/mac/BUILD.gn | 14 +- 135 config/mac/mac_sdk.gni | 18 +- 136 config/mac/rules.gni | 16 +- 137 config/mips.gni | 2 +- 138 config/nacl/BUILD.gn | 2 +- 139 config/nacl/config.gni | 2 +- 140 config/nacl/host_toolchain.gni | 4 +- 141 config/nacl/rules.gni | 4 +- 142 config/ozone.gni | 6 +- 143 config/pch.gni | 6 +- 144 config/posix/BUILD.gn | 4 +- 145 config/profiling/profiling.gni | 4 +- 146 config/python.gni | 4 +- 147 config/riscv.gni | 2 +- 148 config/rust.gni | 14 +- 149 config/sanitizers/BUILD.gn | 30 +- 150 config/sanitizers/sanitizers.gni | 26 +- 151 config/sysroot.gni | 10 +- 152 config/ui.gni | 8 +- 153 config/v8_target_cpu.gni | 12 +- 154 config/win/BUILD.gn | 26 +- 155 config/win/console_app.gni | 2 +- 156 config/win/control_flow_guard.gni | 2 +- 157 config/win/manifest.gni | 10 +- 158 config/zip.gni | 2 +- 159 config/zos/BUILD.gn | 4 +- 160 dotfile_settings.gni | 66 +-- 161 fuchsia/DIR_METADATA | 2 +- 162 fuchsia/cipd/BUILD.gn | 10 +- 163 fuchsia/cipd/DIR_METADATA | 2 +- 164 fuchsia/test/BUILD.gn | 4 +- 165 fuchsia/test/run_pytype.py | 2 +- 166 gn_logs.gni | 18 +- 167 ios/intent_definition.gni | 6 +- 168 linux/BUILD.gn | 8 +- 169 linux/extract_symbols.gni | 6 +- 170 linux/strip_binary.gni | 4 +- 171 linux/unbundle/absl_algorithm.gn | 4 +- 172 linux/unbundle/absl_base.gn | 4 +- 173 linux/unbundle/absl_cleanup.gn | 4 +- 174 linux/unbundle/absl_container.gn | 4 +- 175 linux/unbundle/absl_debugging.gn | 4 +- 176 linux/unbundle/absl_flags.gn | 4 +- 177 linux/unbundle/absl_functional.gn | 4 +- 178 linux/unbundle/absl_hash.gn | 4 +- 179 linux/unbundle/absl_log.gn | 4 +- 180 linux/unbundle/absl_memory.gn | 4 +- 181 linux/unbundle/absl_meta.gn | 4 +- 182 linux/unbundle/absl_numeric.gn | 4 +- 183 linux/unbundle/absl_random.gn | 4 +- 184 linux/unbundle/absl_status.gn | 4 +- 185 linux/unbundle/absl_strings.gn | 4 +- 186 linux/unbundle/absl_synchronization.gn | 4 +- 187 linux/unbundle/absl_time.gn | 4 +- 188 linux/unbundle/absl_types.gn | 4 +- 189 linux/unbundle/absl_utility.gn | 4 +- 190 linux/unbundle/brotli.gn | 4 +- 191 linux/unbundle/crc32c.gn | 2 +- 192 linux/unbundle/dav1d.gn | 4 +- 193 linux/unbundle/double-conversion.gn | 2 +- 194 linux/unbundle/ffmpeg.gn | 6 +- 195 linux/unbundle/flac.gn | 4 +- 196 linux/unbundle/flatbuffers.gn | 2 +- 197 linux/unbundle/highway.gn | 4 +- 198 linux/unbundle/icu.gn | 4 +- 199 linux/unbundle/jsoncpp.gn | 4 +- 200 linux/unbundle/libXNVCtrl.gn | 2 +- 201 linux/unbundle/libaom.gn | 6 +- 202 linux/unbundle/libavif.gn | 4 +- 203 linux/unbundle/libdrm.gn | 4 +- 204 linux/unbundle/libpng.gn | 4 +- 205 linux/unbundle/libsecret.gn | 2 +- 206 linux/unbundle/libusb.gn | 4 +- 207 linux/unbundle/libvpx.gn | 4 +- 208 linux/unbundle/libwebp.gn | 4 +- 209 linux/unbundle/libxml.gn | 2 +- 210 linux/unbundle/libxslt.gn | 2 +- 211 linux/unbundle/libyuv.gn | 4 +- 212 linux/unbundle/openh264.gn | 6 +- 213 linux/unbundle/opus.gn | 4 +- 214 linux/unbundle/re2.gn | 6 +- 215 linux/unbundle/simdutf.gn | 4 +- 216 linux/unbundle/snappy.gn | 2 +- 217 linux/unbundle/swiftshader-SPIRV-Headers.gn | 2 +- 218 linux/unbundle/swiftshader-SPIRV-Tools.gn | 4 +- 219 linux/unbundle/vulkan-SPIRV-Headers.gn | 2 +- 220 linux/unbundle/vulkan-SPIRV-Tools.gn | 4 +- 221 linux/unbundle/woff2.gn | 4 +- 222 linux/unbundle/zlib.gn | 2 +- 223 linux/unbundle/zstd.gn | 4 +- 224 nocompile.gni | 8 +- 225 partitioned_shared_library.gni | 10 +- 226 private_code_test/BUILD.gn | 2 +- 227 private_code_test/private_code_test.gni | 8 +- 228 rust/BUILD.gn | 4 +- 229 rust/cargo_crate.gni | 20 +- 230 rust/chromium_prelude/BUILD.gn | 6 +- 231 rust/chromium_prelude/import_test.rs | 6 +- 232 rust/crubit/BUILD.gn | 6 +- 233 rust/rs_bindings_from_cc.gni | 14 +- 234 rust/rust_bindgen.gni | 14 +- 235 rust/rust_bindgen_generator.gni | 18 +- 236 rust/rust_executable.gni | 2 +- 237 rust/rust_macro.gni | 4 +- 238 rust/rust_shared_library.gni | 2 +- 239 rust/rust_static_library.gni | 4 +- 240 rust/rust_target.gni | 22 +- 241 rust/rust_unit_test.gni | 8 +- 242 rust/std/BUILD.gn | 10 +- 243 rust/std/BUILD.gn.hbs | 22 +- 244 rust/std/rules/BUILD.gn | 454 +++++++++--------- 245 rust/tests/BUILD.gn | 86 ++-- 246 rust/tests/bindgen_cpp_test/BUILD.gn | 4 +- 247 rust/tests/bindgen_cpp_test/main.rs | 2 +- 248 .../BUILD.gn | 4 +- 249 .../bindgen_cpp_test_with_cpp_linkage/lib.rs | 2 +- 250 rust/tests/bindgen_static_fns_test/BUILD.gn | 6 +- 251 rust/tests/bindgen_static_fns_test/main.rs | 2 +- 252 rust/tests/bindgen_static_fns_test/src/lib.rs | 2 +- 253 rust/tests/bindgen_test/BUILD.gn | 6 +- 254 rust/tests/bindgen_test/main.rs | 2 +- 255 rust/tests/bindgen_test/src/lib.rs | 2 +- 256 rust/tests/test_aliased_deps/BUILD.gn | 6 +- 257 rust/tests/test_aliased_deps/main.rs | 2 +- 258 rust/tests/test_bin_crate/BUILD.gn | 2 +- 259 .../test_build_rs_target_arch_x86/BUILD.gn | 2 +- 260 rust/tests/test_control_flow_guard/BUILD.gn | 2 +- 261 rust/tests/test_cpp_including_rust/BUILD.gn | 6 +- 262 rust/tests/test_proc_macro_crate/BUILD.gn | 2 +- 263 rust/tests/test_proc_macro_crate_2/BUILD.gn | 2 +- 264 rust/tests/test_rlib_crate/BUILD.gn | 2 +- 265 rust/tests/test_rlib_crate_testonly/BUILD.gn | 2 +- 266 rust/tests/test_rs_bindings_from_cc/BUILD.gn | 4 +- 267 rust/tests/test_rust_calling_cpp/BUILD.gn | 2 +- 268 rust/tests/test_rust_exe/BUILD.gn | 10 +- 269 rust/tests/test_rust_exe/main.rs | 4 +- 270 rust/tests/test_rust_exe_2/BUILD.gn | 4 +- 271 rust/tests/test_rust_metadata/BUILD.gn | 10 +- 272 rust/tests/test_rust_metadata/lib.rs | 2 +- 273 rust/tests/test_rust_metadata/main.rs | 2 +- 274 rust/tests/test_rust_metadata/tests.rs | 2 +- 275 .../BUILD.gn | 8 +- 276 .../main.rs | 2 +- 277 .../v1/BUILD.gn | 2 +- 278 .../v2/BUILD.gn | 2 +- 279 rust/tests/test_rust_shared_library/BUILD.gn | 2 +- 280 rust/tests/test_rust_static_library/BUILD.gn | 2 +- 281 .../BUILD.gn | 2 +- 282 rust/tests/test_rust_unittests/BUILD.gn | 4 +- 283 rust/tests/test_rust_unittests/main.rs | 2 +- 284 rust/tests/test_serde_json_lenient/BUILD.gn | 2 +- 285 rust/tests/test_simple_rust_exe/BUILD.gn | 2 +- 286 rust/tests/windows_sys_test/BUILD.gn | 6 +- 287 symlink.gni | 2 +- 288 timestamp.gni | 2 +- 289 toolchain/BUILD.gn | 4 +- 290 toolchain/aix/BUILD.gn | 2 +- 291 toolchain/android/BUILD.gn | 14 +- 292 toolchain/android/DIR_METADATA | 2 +- 293 toolchain/apple/BUILD.gn | 2 +- 294 toolchain/apple/toolchain.gni | 62 +-- 295 toolchain/cc_wrapper.gni | 2 +- 296 toolchain/concurrent_links.gni | 14 +- 297 toolchain/cros/BUILD.gn | 10 +- 298 toolchain/cros_toolchain.gni | 4 +- 299 toolchain/fuchsia/BUILD.gn | 2 +- 300 toolchain/fuchsia/DIR_METADATA | 2 +- 301 toolchain/gcc_toolchain.gni | 46 +- 302 toolchain/ios/BUILD.gn | 4 +- 303 toolchain/linux/BUILD.gn | 10 +- 304 toolchain/linux/unbundle/BUILD.gn | 2 +- 305 toolchain/mac/BUILD.gn | 6 +- 306 toolchain/nacl/BUILD.gn | 6 +- 307 toolchain/nacl_toolchain.gni | 4 +- 308 toolchain/rbe.gni | 6 +- 309 toolchain/siso.gni | 4 +- 310 toolchain/toolchain.gni | 6 +- 311 toolchain/wasm/BUILD.gn | 2 +- 312 toolchain/win/BUILD.gn | 6 +- 313 toolchain/win/midl.gni | 4 +- 314 toolchain/win/toolchain.gni | 44 +- 315 toolchain/win/win_toolchain_data.gni | 8 +- 316 toolchain/zos/BUILD.gn | 6 +- 317 util/BUILD.gn | 10 +- 318 util/branding.gni | 2 +- 319 util/generate_wrapper.gni | 2 +- 320 util/java_action.gni | 2 +- 321 util/lastchange.gni | 4 +- 322 util/process_version.gni | 6 +- 323 win/BUILD.gn | 10 +- 324 win/message_compiler.gni | 2 +- 325 304 files changed, 1508 insertions(+), 1508 deletions(-) 326 327 diff --git a/BUILD.gn b/BUILD.gn 328 index c159f3233..42942a955 100644 329 --- a/BUILD.gn 330 +++ b/BUILD.gn 331 @@ -2,16 +2,16 @@ 332 # Use of this source code is governed by a BSD-style license that can be 333 # found in the LICENSE file. 334 335 -import("//build/buildflag_header.gni") 336 -import("//build/config/cast.gni") 337 -import("//build/config/chrome_build.gni") 338 -import("//build/config/chromeos/args.gni") 339 -import("//build/config/features.gni") 340 -import("//build/util/process_version.gni") 341 +import("//chromium/build/buildflag_header.gni") 342 +import("//chromium/build/config/cast.gni") 343 +import("//chromium/build/config/chrome_build.gni") 344 +import("//chromium/build/config/chromeos/args.gni") 345 +import("//chromium/build/config/features.gni") 346 +import("//chromium/build/util/process_version.gni") 347 import("//build_overrides/build.gni") 348 349 if (is_ios) { 350 - import("//build/config/ios/ios_sdk.gni") 351 + import("//chromium/build/config/ios/ios_sdk.gni") 352 } 353 354 source_set("buildflag_header_h") { 355 @@ -125,7 +125,7 @@ if (build_with_chromium) { 356 group("gold_common_pytype") { 357 testonly = true 358 359 - data = [ "//build/skia_gold_common/" ] 360 + data = [ "//chromium/build/skia_gold_common/" ] 361 362 data_deps = [ "//testing:pytype_dependencies" ] 363 } 364 diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py 365 index c39c19cbf..adab1bd8d 100755 366 --- a/PRESUBMIT_test.py 367 +++ b/PRESUBMIT_test.py 368 @@ -34,7 +34,7 @@ class CheckNoBadDepsTest(unittest.TestCase): 369 _fails_deps_check('import("//third_party/foo")', filename='foo.gni')) 370 371 def testPaths(self): 372 - self.assertFalse(_fails_deps_check('import("//build/things.gni")')) 373 + self.assertFalse(_fails_deps_check('import("//chromium/build/things.gni")')) 374 self.assertTrue(_fails_deps_check('import("//chrome/things.gni")')) 375 376 377 diff --git a/android/BUILD.gn b/android/BUILD.gn 378 index bae601822..66c26fddc 100644 379 --- a/android/BUILD.gn 380 +++ b/android/BUILD.gn 381 @@ -2,13 +2,13 @@ 382 # Use of this source code is governed by a BSD-style license that can be 383 # found in the LICENSE file. 384 385 -import("//build/config/android/build_vars.gni") 386 -import("//build/config/android/config.gni") 387 -import("//build/config/android/rules.gni") 388 -import("//build/config/clang/clang.gni") 389 -import("//build/config/coverage/coverage.gni") 390 -import("//build/config/gclient_args.gni") 391 -import("//build/config/python.gni") 392 +import("//chromium/build/config/android/build_vars.gni") 393 +import("//chromium/build/config/android/config.gni") 394 +import("//chromium/build/config/android/rules.gni") 395 +import("//chromium/build/config/clang/clang.gni") 396 +import("//chromium/build/config/coverage/coverage.gni") 397 +import("//chromium/build/config/gclient_args.gni") 398 +import("//chromium/build/config/python.gni") 399 import("//build_overrides/build.gni") 400 401 if (build_with_chromium) { 402 @@ -102,7 +102,7 @@ if (enable_java_templates) { 403 deps = [ 404 ":junit_test_assets", 405 ":junit_test_resources", 406 - "//build/android/test/incremental_javac_gn:no_signature_change_prebuilt_java", 407 + "//chromium/build/android/test/incremental_javac_gn:no_signature_change_prebuilt_java", 408 "//third_party/junit", 409 ] 410 } 411 @@ -129,8 +129,8 @@ if (defined(sanitizer_arch)) { 412 python_library("test_result_presentations_py") { 413 pydeps_file = "pylib/results/presentation/test_results_presentation.pydeps" 414 data = [ 415 - "//build/android/pylib/results/presentation/template", 416 - "//build/android/pylib/results/presentation/javascript/main_html.js", 417 + "//chromium/build/android/pylib/results/presentation/template", 418 + "//chromium/build/android/pylib/results/presentation/javascript/main_html.js", 419 "//third_party/catapult/third_party/gsutil/", 420 "//third_party/jinja2/debug.py", 421 "//third_party/six", 422 @@ -146,7 +146,7 @@ python_library("devil_chromium_py") { 423 "//third_party/catapult/devil/devil/devil_dependencies.json", 424 425 # Read by gn_helpers.BuildWithChromium() 426 - "//build/config/gclient_args.gni", 427 + "//chromium/build/config/gclient_args.gni", 428 ] 429 } 430 431 @@ -157,7 +157,7 @@ group("apk_installer_data") { 432 if (build_with_chromium) { 433 if (!is_component_build) { 434 data_deps = [ 435 - "//build/android/pylib/device/commands", 436 + "//chromium/build/android/pylib/device/commands", 437 "//tools/android/devil_util", 438 ] 439 } 440 @@ -234,7 +234,7 @@ group("test_runner_device_support") { 441 442 # Proguard is needed only when using apks (rather than native executables). 443 if (enable_java_templates) { 444 - data_deps += [ "//build/android/stacktrace:java_deobfuscate" ] 445 + data_deps += [ "//chromium/build/android/stacktrace:java_deobfuscate" ] 446 } 447 } 448 449 diff --git a/android/DIR_METADATA b/android/DIR_METADATA 450 index cdc2d6fb6..37c98f5e4 100644 451 --- a/android/DIR_METADATA 452 +++ b/android/DIR_METADATA 453 @@ -1 +1 @@ 454 -mixins: "//build/android/COMMON_METADATA" 455 +mixins: "//chromium/build/android/COMMON_METADATA" 456 diff --git a/android/bytecode/BUILD.gn b/android/bytecode/BUILD.gn 457 index 7849ea393..91080bb64 100644 458 --- a/android/bytecode/BUILD.gn 459 +++ b/android/bytecode/BUILD.gn 460 @@ -2,7 +2,7 @@ 461 # Use of this source code is governed by a BSD-style license that can be 462 # found in the LICENSE file. 463 464 -import("//build/config/android/rules.gni") 465 +import("//chromium/build/config/android/rules.gni") 466 467 java_binary("trace_event_adder") { 468 main_class = "org.chromium.bytecode.TraceEventAdder" 469 diff --git a/android/gtest_apk/BUILD.gn b/android/gtest_apk/BUILD.gn 470 index 69b0889c9..c5564995f 100644 471 --- a/android/gtest_apk/BUILD.gn 472 +++ b/android/gtest_apk/BUILD.gn 473 @@ -2,7 +2,7 @@ 474 # Use of this source code is governed by a BSD-style license that can be 475 # found in the LICENSE file. 476 477 -import("//build/config/android/rules.gni") 478 +import("//chromium/build/config/android/rules.gni") 479 480 android_library("native_test_instrumentation_test_runner_java") { 481 testonly = true 482 diff --git a/android/gyp/test/BUILD.gn b/android/gyp/test/BUILD.gn 483 index 301a220d0..421865b3e 100644 484 --- a/android/gyp/test/BUILD.gn 485 +++ b/android/gyp/test/BUILD.gn 486 @@ -1,4 +1,4 @@ 487 -import("//build/config/android/rules.gni") 488 +import("//chromium/build/config/android/rules.gni") 489 490 java_library("hello_world_java") { 491 sources = [ "java/org/chromium/helloworld/HelloWorldPrinter.java" ] 492 diff --git a/android/incremental_install/BUILD.gn b/android/incremental_install/BUILD.gn 493 index d7a321882..a615aafa7 100644 494 --- a/android/incremental_install/BUILD.gn 495 +++ b/android/incremental_install/BUILD.gn 496 @@ -2,7 +2,7 @@ 497 # Use of this source code is governed by a BSD-style license that can be 498 # found in the LICENSE file. 499 500 -import("//build/config/android/rules.gni") 501 +import("//chromium/build/config/android/rules.gni") 502 503 android_library("bootstrap_java") { 504 sources = [ 505 diff --git a/android/incremental_install/third_party/AndroidHiddenApiBypass/BUILD.gn b/android/incremental_install/third_party/AndroidHiddenApiBypass/BUILD.gn 506 index d14c7b954..ef535b7c4 100644 507 --- a/android/incremental_install/third_party/AndroidHiddenApiBypass/BUILD.gn 508 +++ b/android/incremental_install/third_party/AndroidHiddenApiBypass/BUILD.gn 509 @@ -2,12 +2,12 @@ 510 # Use of this source code is governed by a BSD-style license that can be 511 # found in the LICENSE file. 512 513 -import("//build/config/android/rules.gni") 514 +import("//chromium/build/config/android/rules.gni") 515 516 # Approved by chrome-security@ only for use by incremental install. 517 visibility = [ 518 ":*", 519 - "//build/android/incremental_install:*", 520 + "//chromium/build/android/incremental_install:*", 521 ] 522 523 android_library("stub_java") { 524 diff --git a/android/native_flags/BUILD.gn b/android/native_flags/BUILD.gn 525 index 317103026..20855df9d 100644 526 --- a/android/native_flags/BUILD.gn 527 +++ b/android/native_flags/BUILD.gn 528 @@ -3,7 +3,7 @@ 529 # found in the LICENSE file. 530 531 if (current_toolchain == default_toolchain) { 532 - import("//build/toolchain/toolchain.gni") 533 + import("//chromium/build/toolchain/toolchain.gni") 534 535 # A toolchain that will capture compiler and linker arguments to a file. 536 toolchain("flagcapture") { 537 @@ -26,7 +26,7 @@ if (current_toolchain == default_toolchain) { 538 description = stamp_description 539 } 540 } 541 -} else if (current_toolchain == "//build/android/native_flags:flagcapture") { 542 +} else if (current_toolchain == "//chromium/build/android/native_flags:flagcapture") { 543 # This will record flags from all default configs of the default toolchain. 544 source_set("default_ccflags") { 545 sources = [ "empty.cc" ] 546 diff --git a/android/pylib/device/commands/BUILD.gn b/android/pylib/device/commands/BUILD.gn 547 index 2f0273487..8033465ee 100644 548 --- a/android/pylib/device/commands/BUILD.gn 549 +++ b/android/pylib/device/commands/BUILD.gn 550 @@ -2,7 +2,7 @@ 551 # Use of this source code is governed by a BSD-style license that can be 552 # found in the LICENSE file. 553 554 -import("//build/config/android/rules.gni") 555 +import("//chromium/build/config/android/rules.gni") 556 557 group("commands") { 558 data_deps = [ ":chromium_commands_java" ] 559 diff --git a/android/resource_sizes.gni b/android/resource_sizes.gni 560 index d0783048b..a670b083e 100644 561 --- a/android/resource_sizes.gni 562 +++ b/android/resource_sizes.gni 563 @@ -2,7 +2,7 @@ 564 # Use of this source code is governed by a BSD-style license that can be 565 # found in the LICENSE file. 566 567 -import("//build/config/android/internal_rules.gni") 568 +import("//chromium/build/config/android/internal_rules.gni") 569 570 # Generates a script in the bin directory that runs 571 # //build/android/resource_sizes.py against the provided apk. 572 @@ -18,13 +18,13 @@ import("//build/config/android/internal_rules.gni") 573 template("android_resource_sizes_test") { 574 generate_android_wrapper(target_name) { 575 forward_variables_from(invoker, [ "data_deps" ]) 576 - executable = "//build/android/resource_sizes.py" 577 + executable = "//chromium/build/android/resource_sizes.py" 578 wrapper_script = "$root_out_dir/bin/run_${target_name}" 579 580 assert(defined(invoker.apk_name) != defined(invoker.file_path), 581 "Exactly one of apk_name or file_path should be provided.") 582 583 - deps = [ "//build/android:resource_sizes_py" ] 584 + deps = [ "//chromium/build/android:resource_sizes_py" ] 585 executable_args = [ 586 "--output-format", 587 "histograms", 588 diff --git a/android/stacktrace/BUILD.gn b/android/stacktrace/BUILD.gn 589 index f8168ab4e..43a33c76c 100644 590 --- a/android/stacktrace/BUILD.gn 591 +++ b/android/stacktrace/BUILD.gn 592 @@ -2,7 +2,7 @@ 593 # Use of this source code is governed by a BSD-style license that can be 594 # found in the LICENSE file. 595 596 -import("//build/config/android/rules.gni") 597 +import("//chromium/build/config/android/rules.gni") 598 599 java_library("java_deobfuscate_java") { 600 sources = [ "java/org/chromium/build/FlushingReTrace.java" ] 601 diff --git a/android/test/BUILD.gn b/android/test/BUILD.gn 602 index e9bbbce1b..24f55fe24 100644 603 --- a/android/test/BUILD.gn 604 +++ b/android/test/BUILD.gn 605 @@ -2,7 +2,7 @@ 606 # Use of this source code is governed by a BSD-style license that can be 607 # found in the LICENSE file. 608 609 -import("//build/config/android/android_nocompile.gni") 610 +import("//chromium/build/config/android/android_nocompile.gni") 611 import("missing_symbol_test.gni") 612 import("nocompile_gn/nocompile_sources.gni") 613 614 @@ -21,7 +21,7 @@ group("android_nocompile_tests") { 615 616 android_nocompile_test_suite("android_lint_tests") { 617 # Depend on lint script so that the action is re-run whenever the script is modified. 618 - pydeps = [ "//build/android/gyp/lint.pydeps" ] 619 + pydeps = [ "//chromium/build/android/gyp/lint.pydeps" ] 620 621 tests = [ 622 { 623 @@ -54,12 +54,12 @@ android_nocompile_test_suite("android_lookup_dep_tests") { 624 rebase_path(import_child_missing_symbol_test_nocompile_sources, 625 "", 626 "nocompile_gn") 627 - expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:import_child_missing_symbol_test_java\n *\"//build/android/test/nocompile_gn:sub_b_java\"" 628 + expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:import_child_missing_symbol_test_java\n *\"//chromium/build/android/test/nocompile_gn:sub_b_java\"" 629 }, 630 { 631 target = "nocompile_gn:import_parent_missing_symbol_test_java" 632 nocompile_sources = [] 633 - expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:import_parent_missing_symbol_test_java\n *\"//build/android/test/nocompile_gn:b_java\"" 634 + expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:import_parent_missing_symbol_test_java\n *\"//chromium/build/android/test/nocompile_gn:b_java\"" 635 }, 636 { 637 target = "nocompile_gn:import_turbine_missing_symbol_test_java" 638 @@ -67,17 +67,17 @@ android_nocompile_test_suite("android_lookup_dep_tests") { 639 rebase_path(import_turbine_missing_symbol_test_nocompile_sources, 640 "", 641 "nocompile_gn") 642 - expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:import_turbine_missing_symbol_test_java\n *\"//build/android/test/nocompile_gn:b_java\"" 643 + expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:import_turbine_missing_symbol_test_java\n *\"//chromium/build/android/test/nocompile_gn:b_java\"" 644 }, 645 { 646 target = "nocompile_gn:prebuilt_missing_symbol_test_java" 647 nocompile_sources = [] 648 - expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:prebuilt_missing_symbol_test_java\n *\"//build/android/test/nocompile_gn:c_prebuilt_java\"" 649 + expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:prebuilt_missing_symbol_test_java\n *\"//chromium/build/android/test/nocompile_gn:c_prebuilt_java\"" 650 }, 651 { 652 target = "nocompile_gn:cpp_template_missing_symbol_test_java" 653 nocompile_sources = [] 654 - expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:cpp_template_missing_symbol_test_java\n *\"//build/android/test/nocompile_gn:d_java\"" 655 + expected_compile_output_regex = "Hint: Try adding the following to //build/android/test/nocompile_gn:cpp_template_missing_symbol_test_java\n *\"//chromium/build/android/test/nocompile_gn:d_java\"" 656 }, 657 ] 658 } 659 diff --git a/android/test/incremental_javac_gn/BUILD.gn b/android/test/incremental_javac_gn/BUILD.gn 660 index 9411497fa..43adf1470 100644 661 --- a/android/test/incremental_javac_gn/BUILD.gn 662 +++ b/android/test/incremental_javac_gn/BUILD.gn 663 @@ -2,7 +2,7 @@ 664 # Use of this source code is governed by a BSD-style license that can be 665 # found in the LICENSE file. 666 667 -import("//build/config/android/rules.gni") 668 +import("//chromium/build/config/android/rules.gni") 669 670 declare_args() { 671 incremental_javac_test_toggle_gn = false 672 @@ -85,7 +85,7 @@ incremental_javac_prebuilt("no_signature_change_prebuilt_generator") { 673 testonly = true 674 sources = all_test_sources 675 toggle_gn_target = ":changing_java" 676 - pydeps = [ "//build/android/gyp/compile_java.pydeps" ] 677 + pydeps = [ "//chromium/build/android/gyp/compile_java.pydeps" ] 678 } 679 680 android_java_prebuilt("no_signature_change_prebuilt_java") { 681 diff --git a/android/test/missing_symbol_test.gni b/android/test/missing_symbol_test.gni 682 index 3cc4741c9..e93eab566 100644 683 --- a/android/test/missing_symbol_test.gni 684 +++ b/android/test/missing_symbol_test.gni 685 @@ -2,11 +2,11 @@ 686 # Use of this source code is governed by a BSD-style license that can be 687 # found in the LICENSE file. 688 689 -import("//build/config/android/android_nocompile.gni") 690 -import("//build/config/android/rules.gni") 691 +import("//chromium/build/config/android/android_nocompile.gni") 692 +import("//chromium/build/config/android/rules.gni") 693 694 missing_symbol_generated_importer_template_nocompile_source = 695 - "//build/android/java/test/missing_symbol/Importer.template" 696 + "//chromium/build/android/java/test/missing_symbol/Importer.template" 697 698 template("missing_symbol_test") { 699 # Not named "_java" to prevent target from being considered a classpath dep. 700 diff --git a/android/test/nocompile_gn/BUILD.gn b/android/test/nocompile_gn/BUILD.gn 701 index 406bd8c48..52d7a9ef0 100644 702 --- a/android/test/nocompile_gn/BUILD.gn 703 +++ b/android/test/nocompile_gn/BUILD.gn 704 @@ -2,9 +2,9 @@ 705 # Use of this source code is governed by a BSD-style license that can be 706 # found in the LICENSE file. 707 708 -import("//build/android/test/missing_symbol_test.gni") 709 -import("//build/config/android/android_nocompile.gni") 710 -import("//build/config/android/rules.gni") 711 +import("//chromium/build/android/test/missing_symbol_test.gni") 712 +import("//chromium/build/config/android/android_nocompile.gni") 713 +import("//chromium/build/config/android/rules.gni") 714 import("nocompile_sources.gni") 715 716 template("lint_test") { 717 @@ -24,7 +24,7 @@ template("lint_test") { 718 # targets. We need to test linting a normal apk target. 719 apk_name = _apk_target_name 720 deps = [ ":$_library_target_name" ] 721 - android_manifest = "//build/android/AndroidManifest.xml" 722 + android_manifest = "//chromium/build/android/AndroidManifest.xml" 723 } 724 725 android_lint(target_name) { 726 diff --git a/android/test_wrapper/logdog_wrapper.gni b/android/test_wrapper/logdog_wrapper.gni 727 index 357bb6c16..cec37a7d7 100644 728 --- a/android/test_wrapper/logdog_wrapper.gni 729 +++ b/android/test_wrapper/logdog_wrapper.gni 730 @@ -2,7 +2,7 @@ 731 # Use of this source code is governed by a BSD-style license that can be 732 # found in the LICENSE file. 733 734 -import("//build/util/generate_wrapper.gni") 735 +import("//chromium/build/util/generate_wrapper.gni") 736 737 # Defines a generated_wrapper script test under bin/ in the build dir that is 738 # itself wrapped by the logdog_wrapper.py tool, which will automatically stream 739 @@ -24,7 +24,7 @@ template("logdog_wrapper_script_test") { 740 executable_args += invoker.args 741 } 742 743 - data_deps = [ "//build/android:logdog_wrapper_py" ] 744 + data_deps = [ "//chromium/build/android:logdog_wrapper_py" ] 745 if (defined(invoker.data_deps)) { 746 data_deps += invoker.data_deps 747 } 748 diff --git a/android/unused_resources/BUILD.gn b/android/unused_resources/BUILD.gn 749 index 4b8749b47..ed196668f 100644 750 --- a/android/unused_resources/BUILD.gn 751 +++ b/android/unused_resources/BUILD.gn 752 @@ -2,10 +2,10 @@ 753 # Use of this source code is governed by a BSD-style license that can be 754 # found in the LICENSE file. 755 756 -import("//build/config/android/rules.gni") 757 +import("//chromium/build/config/android/rules.gni") 758 759 java_binary("unused_resources") { 760 - sources = [ "//build/android/unused_resources/UnusedResources.java" ] 761 + sources = [ "//chromium/build/android/unused_resources/UnusedResources.java" ] 762 main_class = "build.android.unused_resources.UnusedResources" 763 deps = [ 764 "//third_party/android_deps:com_android_tools_common_java", 765 diff --git a/apple/apple_info_plist.gni b/apple/apple_info_plist.gni 766 index bf66dbd6b..eeeed41ff 100644 767 --- a/apple/apple_info_plist.gni 768 +++ b/apple/apple_info_plist.gni 769 @@ -2,7 +2,7 @@ 770 # Use of this source code is governed by a BSD-style license that can be 771 # found in the LICENSE file. 772 773 -import("//build/apple/compile_plist.gni") 774 +import("//chromium/build/apple/compile_plist.gni") 775 776 # The base template used to generate Info.plist files for iOS and Mac apps and 777 # frameworks. 778 diff --git a/apple/compile_entitlements.gni b/apple/compile_entitlements.gni 779 index 1f84a115d..93d042f58 100644 780 --- a/apple/compile_entitlements.gni 781 +++ b/apple/compile_entitlements.gni 782 @@ -2,7 +2,7 @@ 783 # Use of this source code is governed by a BSD-style license that can be 784 # found in the LICENSE file. 785 786 -import("//build/apple/compile_plist.gni") 787 +import("//chromium/build/apple/compile_plist.gni") 788 789 # Template to merge multiple .entitlements files performing variable 790 # substitutions. 791 diff --git a/apple/compile_plist.gni b/apple/compile_plist.gni 792 index df8de0c21..d090b3841 100644 793 --- a/apple/compile_plist.gni 794 +++ b/apple/compile_plist.gni 795 @@ -43,7 +43,7 @@ template("compile_plist") { 796 "testonly", 797 ]) 798 799 - script = "//build/apple/plist_util.py" 800 + script = "//chromium/build/apple/plist_util.py" 801 sources = invoker.plist_templates 802 outputs = [ _merged_name ] 803 args = [ 804 @@ -59,7 +59,7 @@ template("compile_plist") { 805 "testonly", 806 "visibility", 807 ]) 808 - script = "//build/apple/plist_util.py" 809 + script = "//chromium/build/apple/plist_util.py" 810 sources = [ _merged_name ] 811 outputs = [ _output_name ] 812 args = [ 813 diff --git a/apple/convert_plist.gni b/apple/convert_plist.gni 814 index 740bfc77b..ddbc7e948 100644 815 --- a/apple/convert_plist.gni 816 +++ b/apple/convert_plist.gni 817 @@ -27,7 +27,7 @@ template("convert_plist") { 818 "deps", 819 ]) 820 821 - script = "//build/apple/plist_util.py" 822 + script = "//chromium/build/apple/plist_util.py" 823 sources = [ invoker.source ] 824 outputs = [ invoker.output ] 825 args = [ 826 diff --git a/apple/tweak_info_plist.gni b/apple/tweak_info_plist.gni 827 index 347c5d58d..7b67a89ce 100644 828 --- a/apple/tweak_info_plist.gni 829 +++ b/apple/tweak_info_plist.gni 830 @@ -2,7 +2,7 @@ 831 # Use of this source code is governed by a BSD-style license that can be 832 # found in the LICENSE file. 833 834 -import("//build/util/lastchange.gni") 835 +import("//chromium/build/util/lastchange.gni") 836 837 # Template to run the tweak_info_plist.py script on a plist. 838 # 839 @@ -36,7 +36,7 @@ template("tweak_info_plist") { 840 "testonly", 841 "deps", 842 ]) 843 - script = "//build/apple/plist_util.py" 844 + script = "//chromium/build/apple/plist_util.py" 845 sources = invoker.info_plists 846 outputs = [ _source_name ] 847 args = [ 848 @@ -62,10 +62,10 @@ template("tweak_info_plist") { 849 "args", 850 "testonly", 851 ]) 852 - script = "//build/apple/tweak_info_plist.py" 853 + script = "//chromium/build/apple/tweak_info_plist.py" 854 inputs = [ 855 script, 856 - "//build/util/version.py", 857 + "//chromium/build/util/version.py", 858 lastchange_file, 859 "//chrome/VERSION", 860 ] 861 diff --git a/args/headless.gn b/args/headless.gn 862 index ed8c03242..fef6b45ba 100644 863 --- a/args/headless.gn 864 +++ b/args/headless.gn 865 @@ -2,7 +2,7 @@ 866 # 867 # Add import to arg.gn in out directory and run gn gen on the directory to use. 868 # E.g. for out directory out/foo: 869 -# echo 'import("//build/args/headless.gn")' > out/foo/args.gn 870 +# echo 'import("//chromium/build/args/headless.gn")' > out/foo/args.gn 871 # gn gen out/foo 872 # 873 # Use gn args to add your own build preference args. 874 diff --git a/buildflag_header.gni b/buildflag_header.gni 875 index f7b42f724..c9f091fcb 100644 876 --- a/buildflag_header.gni 877 +++ b/buildflag_header.gni 878 @@ -95,7 +95,7 @@ 879 # } 880 template("buildflag_header") { 881 action(target_name) { 882 - script = "//build/write_buildflag_header.py" 883 + script = "//chromium/build/write_buildflag_header.py" 884 885 if (defined(invoker.header_dir)) { 886 header_file = "${invoker.header_dir}/${invoker.header}" 887 @@ -132,6 +132,6 @@ template("buildflag_header") { 888 "visibility", 889 ]) 890 891 - public_deps = [ "//build:buildflag_header_h" ] 892 + public_deps = [ "//chromium/build:buildflag_header_h" ] 893 } 894 } 895 diff --git a/chromeos/crosier_tests.gni b/chromeos/crosier_tests.gni 896 index b717dacbe..3f6eb7e45 100644 897 --- a/chromeos/crosier_tests.gni 898 +++ b/chromeos/crosier_tests.gni 899 @@ -11,7 +11,7 @@ 900 # to the test sources. These files will be copied to the appropriate directory. 901 # See docs/testing/chromeos_integration/crosier_metadata.md for details. 902 903 -import("//build/config/chromeos/ui_mode.gni") 904 +import("//chromium/build/config/chromeos/ui_mode.gni") 905 906 template("crosier_tests") { 907 assert(is_chromeos_device) 908 diff --git a/chromeos/embed_sections.gni b/chromeos/embed_sections.gni 909 index 83eb06b23..40e0e800a 100644 910 --- a/chromeos/embed_sections.gni 911 +++ b/chromeos/embed_sections.gni 912 @@ -2,7 +2,7 @@ 913 # Use of this source code is governed by a BSD-style license that can be 914 # found in the LICENSE file. 915 916 -import("//build/toolchain/toolchain.gni") 917 +import("//chromium/build/toolchain/toolchain.gni") 918 919 # Embed elf section information of a binary into the binary's predefined 920 # symbols. 921 @@ -19,7 +19,7 @@ template("embed_sections") { 922 "testonly", 923 ]) 924 action("${target_name}") { 925 - script = "//build/chromeos/embed_sections.py" 926 + script = "//chromium/build/chromeos/embed_sections.py" 927 928 if (defined(invoker.sections_embedded_binary_output)) { 929 sections_embedded_binary_output = invoker.sections_embedded_binary_output 930 diff --git a/cipd/cipd.gni b/cipd/cipd.gni 931 index 83224498a..00b4bd4f2 100644 932 --- a/cipd/cipd.gni 933 +++ b/cipd/cipd.gni 934 @@ -122,7 +122,7 @@ template("cipd_package_definition_by_file") { 935 _output_yaml_filename = invoker.package_definition_yaml 936 } 937 action(target_name) { 938 - script = "//build/cipd/cipd_from_file.py" 939 + script = "//chromium/build/cipd/cipd_from_file.py" 940 inputs = [ invoker.files_file ] 941 args = [ 942 "--description=" + invoker.description, 943 diff --git a/compiled_action.gni b/compiled_action.gni 944 index f5df30108..f74ca96ee 100644 945 --- a/compiled_action.gni 946 +++ b/compiled_action.gni 947 @@ -98,7 +98,7 @@ template("compiled_action") { 948 inputs = [] 949 } 950 951 - script = "//build/gn_run_binary.py" 952 + script = "//chromium/build/gn_run_binary.py" 953 954 # Constuct the host toolchain version of the tool. 955 host_tool = invoker.tool + "($host_toolchain)" 956 @@ -145,7 +145,7 @@ template("compiled_action_foreach") { 957 inputs = [] 958 } 959 960 - script = "//build/gn_run_binary.py" 961 + script = "//chromium/build/gn_run_binary.py" 962 963 # Constuct the host toolchain version of the tool. 964 host_tool = invoker.tool + "($host_toolchain)" 965 diff --git a/config/BUILD.gn b/config/BUILD.gn 966 index d8352aadf..36c03e0dd 100644 967 --- a/config/BUILD.gn 968 +++ b/config/BUILD.gn 969 @@ -2,25 +2,25 @@ 970 # Use of this source code is governed by a BSD-style license that can be 971 # found in the LICENSE file. 972 973 -import("//build/config/c++/c++.gni") 974 -import("//build/config/cast.gni") 975 -import("//build/config/chrome_build.gni") 976 -import("//build/config/dcheck_always_on.gni") 977 -import("//build/config/features.gni") 978 +import("//chromium/build/config/c++/c++.gni") 979 +import("//chromium/build/config/cast.gni") 980 +import("//chromium/build/config/chrome_build.gni") 981 +import("//chromium/build/config/dcheck_always_on.gni") 982 +import("//chromium/build/config/features.gni") 983 984 # Subprojects need to override arguments in {mac,ios}_sdk_overrides.gni in their 985 # .gn config, but those arguments are only used on macOS. Including 986 # mac_sdk_overrides.gni insures that this doesn't trigger an unused argument 987 # warning. 988 -import("//build/config/ios/ios_sdk_overrides.gni") 989 -import("//build/config/mac/mac_sdk_overrides.gni") 990 +import("//chromium/build/config/ios/ios_sdk_overrides.gni") 991 +import("//chromium/build/config/mac/mac_sdk_overrides.gni") 992 993 -import("//build/config/pch.gni") 994 -import("//build/config/rust.gni") 995 -import("//build/config/sanitizers/sanitizers.gni") 996 -import("//build/config/ui.gni") 997 +import("//chromium/build/config/pch.gni") 998 +import("//chromium/build/config/rust.gni") 999 +import("//chromium/build/config/sanitizers/sanitizers.gni") 1000 +import("//chromium/build/config/ui.gni") 1001 if (is_android) { 1002 - import("//build/config/android/abi.gni") 1003 + import("//chromium/build/config/android/abi.gni") 1004 } 1005 1006 # ============================================== 1007 @@ -237,11 +237,11 @@ group("common_deps_without_libcxx") { 1008 public_deps = [ ":$_toolchain_marker_name" ] 1009 1010 if (using_sanitizer) { 1011 - public_deps += [ "//build/config/sanitizers:deps" ] 1012 + public_deps += [ "//chromium/build/config/sanitizers:deps" ] 1013 } 1014 1015 if (use_libfuzzer) { 1016 - public_deps += [ "//build/config/sanitizers:dlclose_shim" ] 1017 + public_deps += [ "//chromium/build/config/sanitizers:dlclose_shim" ] 1018 } 1019 1020 if (use_afl) { 1021 @@ -256,7 +256,7 @@ group("common_deps_without_libcxx") { 1022 public_deps += 1023 [ "//third_party/fuchsia-gn-sdk/src/config:runtime_library_group" ] 1024 if (is_asan) { 1025 - public_deps += [ "//build/config/fuchsia:asan_runtime_library" ] 1026 + public_deps += [ "//chromium/build/config/fuchsia:asan_runtime_library" ] 1027 } 1028 } 1029 1030 @@ -271,7 +271,7 @@ group("common_deps_without_libcxx") { 1031 # The CRT runtime is dynamically linked in component builds and needs to 1032 # be present on bots that run exes or load DLLs. This also includes 1033 # debugging DLLs in all builds. 1034 - data_deps = [ "//build/win:runtime_libs" ] 1035 + data_deps = [ "//chromium/build/win:runtime_libs" ] 1036 1037 if (host_os == "win") { 1038 # In order to ensure the ACLing is applied to every binary loaded in an 1039 @@ -279,7 +279,7 @@ group("common_deps_without_libcxx") { 1040 # do this because the tool is subject to race conditions if a binary is 1041 # placed in the out folder while it is running. 1042 public_deps += 1043 - [ "//build/config/win:maybe_set_appcontainer_acls($host_toolchain)" ] 1044 + [ "//chromium/build/config/win:maybe_set_appcontainer_acls($host_toolchain)" ] 1045 } 1046 } 1047 } 1048 @@ -329,8 +329,8 @@ group("shared_library_deps") { 1049 # Windows linker setup for EXEs and DLLs. 1050 if (is_win) { 1051 _windows_linker_configs = [ 1052 - "//build/config/win:sdk_link", 1053 - "//build/config/win:common_linker_setup", 1054 + "//chromium/build/config/win:sdk_link", 1055 + "//chromium/build/config/win:common_linker_setup", 1056 ] 1057 } 1058 1059 @@ -341,16 +341,16 @@ config("executable_config") { 1060 if (is_win) { 1061 configs += _windows_linker_configs 1062 } else if (is_mac) { 1063 - configs += [ "//build/config/mac:mac_dynamic_flags" ] 1064 + configs += [ "//chromium/build/config/mac:mac_dynamic_flags" ] 1065 } else if (is_ios) { 1066 configs += [ 1067 - "//build/config/ios:ios_dynamic_flags", 1068 - "//build/config/ios:ios_executable_flags", 1069 + "//chromium/build/config/ios:ios_dynamic_flags", 1070 + "//chromium/build/config/ios:ios_executable_flags", 1071 ] 1072 } else if (is_linux || is_chromeos || is_android || current_os == "aix") { 1073 - configs += [ "//build/config/gcc:executable_config" ] 1074 + configs += [ "//chromium/build/config/gcc:executable_config" ] 1075 if (is_castos || is_cast_android) { 1076 - configs += [ "//build/config/chromecast:executable_config" ] 1077 + configs += [ "//chromium/build/config/chromecast:executable_config" ] 1078 } 1079 } 1080 1081 @@ -373,16 +373,16 @@ config("shared_library_config") { 1082 if (is_win) { 1083 configs += _windows_linker_configs 1084 } else if (is_mac) { 1085 - configs += [ "//build/config/mac:mac_dynamic_flags" ] 1086 + configs += [ "//chromium/build/config/mac:mac_dynamic_flags" ] 1087 } else if (is_ios) { 1088 configs += [ 1089 - "//build/config/ios:ios_dynamic_flags", 1090 - "//build/config/ios:ios_shared_library_flags", 1091 + "//chromium/build/config/ios:ios_dynamic_flags", 1092 + "//chromium/build/config/ios:ios_shared_library_flags", 1093 ] 1094 } else if (is_castos || is_cast_android) { 1095 - configs += [ "//build/config/chromecast:shared_library_config" ] 1096 + configs += [ "//chromium/build/config/chromecast:shared_library_config" ] 1097 } else if (is_linux || is_chromeos || current_os == "aix") { 1098 - configs += [ "//build/config/gcc:shared_library_config" ] 1099 + configs += [ "//chromium/build/config/gcc:shared_library_config" ] 1100 } 1101 1102 # If we're using the prebuilt instrumented libraries with the sanitizers, we 1103 @@ -414,12 +414,12 @@ config("precompiled_headers") { 1104 # This is a file that GN will compile with the above header. It will be 1105 # implicitly added to the sources (potentially multiple times, with one 1106 # variant for each language used in the target). 1107 - precompiled_source = "//build/precompile.cc" 1108 + precompiled_source = "//chromium/build/precompile.cc" 1109 1110 # Force include the header. 1111 cflags = [ "/FI$precompiled_header" ] 1112 } else if (is_mac || is_linux) { 1113 - precompiled_source = "//build/precompile.h" 1114 + precompiled_source = "//chromium/build/precompile.h" 1115 } 1116 } 1117 } 1118 diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn 1119 index f1189be21..4bb38fe31 100644 1120 --- a/config/BUILDCONFIG.gn 1121 +++ b/config/BUILDCONFIG.gn 1122 @@ -208,33 +208,33 @@ if (host_toolchain == "") { 1123 1124 if (host_os == "linux" || host_os == "openbsd") { 1125 if (target_os != "linux") { 1126 - host_toolchain = "//build/toolchain/linux:clang_$host_cpu" 1127 + host_toolchain = "//chromium/build/toolchain/linux:clang_$host_cpu" 1128 } else if (is_clang) { 1129 - host_toolchain = "//build/toolchain/linux:clang_$host_cpu" 1130 + host_toolchain = "//chromium/build/toolchain/linux:clang_$host_cpu" 1131 } else { 1132 - host_toolchain = "//build/toolchain/linux:$host_cpu" 1133 + host_toolchain = "//chromium/build/toolchain/linux:$host_cpu" 1134 } 1135 } else if (host_os == "mac") { 1136 - host_toolchain = "//build/toolchain/mac:clang_$host_cpu" 1137 + host_toolchain = "//chromium/build/toolchain/mac:clang_$host_cpu" 1138 } else if (host_os == "win") { 1139 # On Windows always use the target CPU for host builds for x86/x64. On the 1140 # configurations we support this will always work and it saves build steps. 1141 # Windows ARM64 targets require an x64 host for cross build. 1142 if (target_cpu == "x86" || target_cpu == "x64") { 1143 if (is_clang) { 1144 - host_toolchain = "//build/toolchain/win:win_clang_$target_cpu" 1145 + host_toolchain = "//chromium/build/toolchain/win:win_clang_$target_cpu" 1146 } else { 1147 - host_toolchain = "//build/toolchain/win:$target_cpu" 1148 + host_toolchain = "//chromium/build/toolchain/win:$target_cpu" 1149 } 1150 } else if (is_clang) { 1151 - host_toolchain = "//build/toolchain/win:win_clang_$host_cpu" 1152 + host_toolchain = "//chromium/build/toolchain/win:win_clang_$host_cpu" 1153 } else { 1154 - host_toolchain = "//build/toolchain/win:$host_cpu" 1155 + host_toolchain = "//chromium/build/toolchain/win:$host_cpu" 1156 } 1157 } else if (host_os == "aix") { 1158 - host_toolchain = "//build/toolchain/aix:$host_cpu" 1159 + host_toolchain = "//chromium/build/toolchain/aix:$host_cpu" 1160 } else if (host_os == "zos") { 1161 - host_toolchain = "//build/toolchain/zos:$host_cpu" 1162 + host_toolchain = "//chromium/build/toolchain/zos:$host_cpu" 1163 } else { 1164 assert(false, "Unsupported host_os: $host_os") 1165 } 1166 @@ -245,40 +245,40 @@ _default_toolchain = "" 1167 if (target_os == "android") { 1168 # Targeting android on Mac is best-effort and not guaranteed to work. 1169 #assert(host_os == "linux", "Android builds are only supported on Linux.") 1170 - _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" 1171 + _default_toolchain = "//chromium/build/toolchain/android:android_clang_$target_cpu" 1172 } else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") { 1173 # See comments in build/toolchain/cros/BUILD.gn about board compiles. 1174 if (is_clang) { 1175 - _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" 1176 + _default_toolchain = "//chromium/build/toolchain/linux:clang_$target_cpu" 1177 } else { 1178 - _default_toolchain = "//build/toolchain/linux:$target_cpu" 1179 + _default_toolchain = "//chromium/build/toolchain/linux:$target_cpu" 1180 } 1181 } else if (target_os == "fuchsia") { 1182 - _default_toolchain = "//build/toolchain/fuchsia:$target_cpu" 1183 + _default_toolchain = "//chromium/build/toolchain/fuchsia:$target_cpu" 1184 } else if (target_os == "ios") { 1185 - _default_toolchain = "//build/toolchain/ios:ios_clang_$target_cpu" 1186 + _default_toolchain = "//chromium/build/toolchain/ios:ios_clang_$target_cpu" 1187 } else if (target_os == "mac") { 1188 #assert(host_os == "mac" || host_os == "linux", 1189 # "Mac cross-compiles are unsupported.") 1190 - _default_toolchain = "//build/toolchain/mac:clang_$target_cpu" 1191 + _default_toolchain = "//chromium/build/toolchain/mac:clang_$target_cpu" 1192 } else if (target_os == "win") { 1193 # On Windows, we use the same toolchain for host and target by default. 1194 # Beware, win cross builds have some caveats, see docs/win_cross.md 1195 if (is_clang) { 1196 - _default_toolchain = "//build/toolchain/win:win_clang_$target_cpu" 1197 + _default_toolchain = "//chromium/build/toolchain/win:win_clang_$target_cpu" 1198 } else { 1199 - _default_toolchain = "//build/toolchain/win:$target_cpu" 1200 + _default_toolchain = "//chromium/build/toolchain/win:$target_cpu" 1201 } 1202 } else if (target_os == "winuwp") { 1203 # Only target WinUWP on for a Windows store application and only 1204 # x86, x64 and arm are supported target CPUs. 1205 assert(target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm" || 1206 target_cpu == "arm64") 1207 - _default_toolchain = "//build/toolchain/win:uwp_$target_cpu" 1208 + _default_toolchain = "//chromium/build/toolchain/win:uwp_$target_cpu" 1209 } else if (target_os == "aix") { 1210 - _default_toolchain = "//build/toolchain/aix:$target_cpu" 1211 + _default_toolchain = "//chromium/build/toolchain/aix:$target_cpu" 1212 } else if (target_os == "zos") { 1213 - _default_toolchain = "//build/toolchain/zos:$target_cpu" 1214 + _default_toolchain = "//chromium/build/toolchain/zos:$target_cpu" 1215 } else { 1216 assert(false, "Unsupported target_os: $target_os") 1217 } 1218 @@ -343,77 +343,77 @@ is_posix = !is_win && !is_fuchsia 1219 1220 # Holds all configs used for running the compiler. 1221 default_compiler_configs = [ 1222 - "//build/config:feature_flags", 1223 - "//build/config/compiler:afdo", 1224 - "//build/config/compiler:afdo_optimize_size", 1225 - "//build/config/compiler:cet_shadow_stack", 1226 - "//build/config/compiler:chromium_code", 1227 - "//build/config/compiler:compiler", 1228 - "//build/config/compiler:compiler_arm_fpu", 1229 - "//build/config/compiler:compiler_arm_thumb", 1230 - "//build/config/compiler:default_include_dirs", 1231 - "//build/config/compiler:default_init_stack_vars", 1232 - "//build/config/compiler:default_optimization", 1233 - "//build/config/compiler:default_stack_frames", 1234 - "//build/config/compiler:default_symbols", 1235 - "//build/config/compiler:disallow_unstable_features", 1236 - "//build/config/compiler:libcxx_hardening", 1237 - "//build/config/compiler:libcxx_module", 1238 - "//build/config/compiler:no_exceptions", 1239 - "//build/config/compiler:no_rtti", 1240 - "//build/config/compiler:no_unresolved_symbols", 1241 - "//build/config/compiler:runtime_library", 1242 - "//build/config/compiler:thin_archive", 1243 - "//build/config/compiler:thinlto_optimize_default", 1244 - "//build/config/compiler/pgo:default_pgo_flags", 1245 - "//build/config/coverage:default_coverage", 1246 - "//build/config/sanitizers:default_sanitizer_flags", 1247 + "//chromium/build/config:feature_flags", 1248 + "//chromium/build/config/compiler:afdo", 1249 + "//chromium/build/config/compiler:afdo_optimize_size", 1250 + "//chromium/build/config/compiler:cet_shadow_stack", 1251 + "//chromium/build/config/compiler:chromium_code", 1252 + "//chromium/build/config/compiler:compiler", 1253 + "//chromium/build/config/compiler:compiler_arm_fpu", 1254 + "//chromium/build/config/compiler:compiler_arm_thumb", 1255 + "//chromium/build/config/compiler:default_include_dirs", 1256 + "//chromium/build/config/compiler:default_init_stack_vars", 1257 + "//chromium/build/config/compiler:default_optimization", 1258 + "//chromium/build/config/compiler:default_stack_frames", 1259 + "//chromium/build/config/compiler:default_symbols", 1260 + "//chromium/build/config/compiler:disallow_unstable_features", 1261 + "//chromium/build/config/compiler:libcxx_hardening", 1262 + "//chromium/build/config/compiler:libcxx_module", 1263 + "//chromium/build/config/compiler:no_exceptions", 1264 + "//chromium/build/config/compiler:no_rtti", 1265 + "//chromium/build/config/compiler:no_unresolved_symbols", 1266 + "//chromium/build/config/compiler:runtime_library", 1267 + "//chromium/build/config/compiler:thin_archive", 1268 + "//chromium/build/config/compiler:thinlto_optimize_default", 1269 + "//chromium/build/config/compiler/pgo:default_pgo_flags", 1270 + "//chromium/build/config/coverage:default_coverage", 1271 + "//chromium/build/config/sanitizers:default_sanitizer_flags", 1272 ] 1273 1274 if (is_win) { 1275 default_compiler_configs += [ 1276 - "//build/config/win:default_cfg_compiler", 1277 - "//build/config/win:default_crt", 1278 - "//build/config/win:lean_and_mean", 1279 - "//build/config/win:nominmax", 1280 - "//build/config/win:unicode", 1281 - "//build/config/win:winver", 1282 + "//chromium/build/config/win:default_cfg_compiler", 1283 + "//chromium/build/config/win:default_crt", 1284 + "//chromium/build/config/win:lean_and_mean", 1285 + "//chromium/build/config/win:nominmax", 1286 + "//chromium/build/config/win:unicode", 1287 + "//chromium/build/config/win:winver", 1288 ] 1289 } 1290 1291 if (is_apple) { 1292 - default_compiler_configs += [ "//build/config/compiler:enable_arc" ] 1293 + default_compiler_configs += [ "//chromium/build/config/compiler:enable_arc" ] 1294 } 1295 1296 if (is_posix) { 1297 if (current_os != "aix") { 1298 default_compiler_configs += 1299 - [ "//build/config/gcc:symbol_visibility_hidden" ] 1300 + [ "//chromium/build/config/gcc:symbol_visibility_hidden" ] 1301 } 1302 } 1303 1304 if (is_fuchsia) { 1305 - default_compiler_configs += [ "//build/config/gcc:symbol_visibility_hidden" ] 1306 + default_compiler_configs += [ "//chromium/build/config/gcc:symbol_visibility_hidden" ] 1307 } 1308 1309 if (is_android) { 1310 default_compiler_configs += 1311 - [ "//build/config/android:default_orderfile_instrumentation" ] 1312 + [ "//chromium/build/config/android:default_orderfile_instrumentation" ] 1313 } 1314 1315 if (is_clang && !is_nacl) { 1316 default_compiler_configs += [ 1317 - "//build/config/clang:extra_warnings", 1318 - "//build/config/clang:find_bad_constructs", 1319 - "//build/config/clang:unsafe_buffers", 1320 + "//chromium/build/config/clang:extra_warnings", 1321 + "//chromium/build/config/clang:find_bad_constructs", 1322 + "//chromium/build/config/clang:unsafe_buffers", 1323 ] 1324 } 1325 1326 # Debug/release-related defines. 1327 if (is_debug) { 1328 - default_compiler_configs += [ "//build/config:debug" ] 1329 + default_compiler_configs += [ "//chromium/build/config:debug" ] 1330 } else { 1331 - default_compiler_configs += [ "//build/config:release" ] 1332 + default_compiler_configs += [ "//chromium/build/config:release" ] 1333 } 1334 1335 # Static libraries and source sets use only the compiler ones. 1336 @@ -433,29 +433,29 @@ if (is_win) { 1337 # Many targets remove these configs, so they are not contained within 1338 # //build/config:executable_config for easy removal. 1339 _linker_configs = [ 1340 - "//build/config/win:default_incremental_linking", 1341 + "//chromium/build/config/win:default_incremental_linking", 1342 1343 # Default to console-mode apps. Most of our targets are tests and such 1344 # that shouldn't use the windows subsystem. 1345 - "//build/config/win:console", 1346 + "//chromium/build/config/win:console", 1347 ] 1348 } else if (is_apple) { 1349 - _linker_configs = [ "//build/config/apple:strip_all" ] 1350 + _linker_configs = [ "//chromium/build/config/apple:strip_all" ] 1351 } else { 1352 _linker_configs = [] 1353 } 1354 1355 # Executable defaults. 1356 default_executable_configs = default_compiler_configs + [ 1357 - "//build/config/compiler:export_dynamic", 1358 - "//build/config:default_libs", 1359 - "//build/config:executable_config", 1360 + "//chromium/build/config/compiler:export_dynamic", 1361 + "//chromium/build/config:default_libs", 1362 + "//chromium/build/config:executable_config", 1363 ] + _linker_configs 1364 1365 if (is_win) { 1366 # Turn on linker CFI for executables, and position it so it can be removed 1367 # if needed. 1368 - default_executable_configs += [ "//build/config/win:cfi_linker" ] 1369 + default_executable_configs += [ "//chromium/build/config/win:cfi_linker" ] 1370 } 1371 if (is_fuchsia) { 1372 # Sometimes executables are linked by rustc passing a command line to 1373 @@ -463,7 +463,7 @@ if (is_fuchsia) { 1374 # resulting (fatal) warning. Unfortunately there's no way to do this only 1375 # for binaries linked by rustc; gn does not make the distinction. 1376 default_executable_configs += 1377 - [ "//build/config/fuchsia:rustc_no_pie_warning" ] 1378 + [ "//chromium/build/config/fuchsia:rustc_no_pie_warning" ] 1379 } 1380 1381 set_defaults("executable") { 1382 @@ -473,19 +473,19 @@ set_defaults("executable") { 1383 # Shared library and loadable module defaults (also for components in component 1384 # mode). 1385 default_shared_library_configs = default_compiler_configs + [ 1386 - "//build/config:default_libs", 1387 - "//build/config:shared_library_config", 1388 + "//chromium/build/config:default_libs", 1389 + "//chromium/build/config:shared_library_config", 1390 ] + _linker_configs 1391 if (is_win) { 1392 # Turn on linker CFI for DLLs, and position it so it can be removed if needed. 1393 - default_shared_library_configs += [ "//build/config/win:cfi_linker" ] 1394 + default_shared_library_configs += [ "//chromium/build/config/win:cfi_linker" ] 1395 } 1396 1397 if (is_android) { 1398 # Strip native JNI exports from shared libraries by default. Binaries that 1399 # want this can remove this config. 1400 default_shared_library_configs += 1401 - [ "//build/config/android:hide_all_but_jni_onload" ] 1402 + [ "//chromium/build/config/android:hide_all_but_jni_onload" ] 1403 } 1404 if (is_fuchsia) { 1405 # Sometimes shared libraries are linked by rustc passing a command line to 1406 @@ -493,7 +493,7 @@ if (is_fuchsia) { 1407 # resulting (fatal) warning. Unfortunately there's no way to do this only 1408 # for binaries linked by rustc; gn does not make the distinction. 1409 default_shared_library_configs += 1410 - [ "//build/config/fuchsia:rustc_no_pie_warning" ] 1411 + [ "//chromium/build/config/fuchsia:rustc_no_pie_warning" ] 1412 } 1413 set_defaults("shared_library") { 1414 configs = default_shared_library_configs 1415 @@ -503,20 +503,20 @@ set_defaults("loadable_module") { 1416 1417 # loadable_modules are generally used by other libs, not just via JNI. 1418 if (is_android) { 1419 - configs -= [ "//build/config/android:hide_all_but_jni_onload" ] 1420 + configs -= [ "//chromium/build/config/android:hide_all_but_jni_onload" ] 1421 } 1422 } 1423 1424 default_rust_proc_macro_configs = 1425 - default_shared_library_configs + [ "//build/rust:proc_macro_extern" ] + 1426 + default_shared_library_configs + [ "//chromium/build/rust:proc_macro_extern" ] + 1427 # Rust proc macros don't support (Thin)LTO, so always remove it. 1428 [ 1429 - "//build/config/compiler:thinlto_optimize_default", 1430 - "//build/config/compiler:thinlto_optimize_max", 1431 + "//chromium/build/config/compiler:thinlto_optimize_default", 1432 + "//chromium/build/config/compiler:thinlto_optimize_max", 1433 ] - 1434 [ 1435 - "//build/config/compiler:thinlto_optimize_default", 1436 - "//build/config/compiler:thinlto_optimize_max", 1437 + "//chromium/build/config/compiler:thinlto_optimize_default", 1438 + "//chromium/build/config/compiler:thinlto_optimize_max", 1439 ] 1440 1441 set_defaults("rust_proc_macro") { 1442 @@ -607,8 +607,8 @@ foreach(_target_type, 1443 # Variables 1444 # no_default_deps: If true, no standard dependencies will be added. 1445 # Targets that set this usually also want to remove 1446 -# "//build/config/compiler:runtime_library" from configs (to remove 1447 -# its subconfig "//build/config/c++:runtime_library"). 1448 +# "//chromium/build/config/compiler:runtime_library" from configs (to remove 1449 +# its subconfig "//chromium/build/config/c++:runtime_library"). 1450 # use_libcxx_modules: If true, libc++'s modules are added to deps. 1451 # This is true by default. 1452 foreach(_target_type, 1453 @@ -662,7 +662,7 @@ foreach(_target_type, 1454 # //build/config:shared_library_deps 1455 # (This explicit list is so that grepping for these configs finds where 1456 # they are used.) 1457 - deps += [ "//build/config:${_target_type}_deps" ] 1458 + deps += [ "//chromium/build/config:${_target_type}_deps" ] 1459 } 1460 1461 if (is_clang && (!defined(invoker.use_libcxx_modules) || 1462 @@ -783,12 +783,12 @@ if (is_component_build) { 1463 default_component_configs = default_shared_library_configs 1464 if (is_android) { 1465 default_component_configs -= 1466 - [ "//build/config/android:hide_all_but_jni_onload" ] 1467 + [ "//chromium/build/config/android:hide_all_but_jni_onload" ] 1468 } 1469 if (is_win) { 1470 # We don't want component dlls to statically load OS dlls that aren't 1471 # loaded normally. 1472 - default_component_configs += [ "//build/config/win:delayloads" ] 1473 + default_component_configs += [ "//chromium/build/config/win:delayloads" ] 1474 } 1475 } else { 1476 default_component_configs = default_compiler_configs 1477 diff --git a/config/aix/BUILD.gn b/config/aix/BUILD.gn 1478 index 6e55c8393..a4b574620 100644 1479 --- a/config/aix/BUILD.gn 1480 +++ b/config/aix/BUILD.gn 1481 @@ -2,8 +2,8 @@ 1482 # Use of this source code is governed by a BSD-style license that can be 1483 # found in the LICENSE file. 1484 1485 -import("//build/config/sanitizers/sanitizers.gni") 1486 -import("//build/toolchain/toolchain.gni") 1487 +import("//chromium/build/config/sanitizers/sanitizers.gni") 1488 +import("//chromium/build/toolchain/toolchain.gni") 1489 1490 # This is included by reference in the //build/config/compiler config that 1491 # is applied to all targets. It is here to separate out the logic. 1492 diff --git a/config/android/BUILD.gn b/config/android/BUILD.gn 1493 index 8c77eb2c9..2b2c64ba8 100644 1494 --- a/config/android/BUILD.gn 1495 +++ b/config/android/BUILD.gn 1496 @@ -2,13 +2,13 @@ 1497 # Use of this source code is governed by a BSD-style license that can be 1498 # found in the LICENSE file. 1499 1500 -import("//build/config/android/rules.gni") 1501 -import("//build/config/c++/c++.gni") 1502 -import("//build/config/compiler/compiler.gni") 1503 -import("//build/config/sanitizers/sanitizers.gni") 1504 +import("//chromium/build/config/android/rules.gni") 1505 +import("//chromium/build/config/c++/c++.gni") 1506 +import("//chromium/build/config/compiler/compiler.gni") 1507 +import("//chromium/build/config/sanitizers/sanitizers.gni") 1508 1509 if (current_toolchain == default_toolchain) { 1510 - import("//build/toolchain/concurrent_links.gni") 1511 + import("//chromium/build/toolchain/concurrent_links.gni") 1512 } 1513 1514 assert(is_android) 1515 @@ -95,14 +95,14 @@ config("runtime_library") { 1516 } 1517 1518 config("hide_all_but_jni_onload") { 1519 - _version_script = "//build/android/android_only_explicit_jni_exports.lst" 1520 + _version_script = "//chromium/build/android/android_only_explicit_jni_exports.lst" 1521 inputs = [ _version_script ] 1522 ldflags = 1523 [ "-Wl,--version-script=" + rebase_path(_version_script, root_build_dir) ] 1524 } 1525 1526 config("hide_all_but_jni") { 1527 - _version_script = "//build/android/android_only_jni_exports.lst" 1528 + _version_script = "//chromium/build/android/android_only_jni_exports.lst" 1529 inputs = [ _version_script ] 1530 ldflags = 1531 [ "-Wl,--version-script=" + rebase_path(_version_script, root_build_dir) ] 1532 diff --git a/config/android/DIR_METADATA b/config/android/DIR_METADATA 1533 index cdc2d6fb6..37c98f5e4 100644 1534 --- a/config/android/DIR_METADATA 1535 +++ b/config/android/DIR_METADATA 1536 @@ -1 +1 @@ 1537 -mixins: "//build/android/COMMON_METADATA" 1538 +mixins: "//chromium/build/android/COMMON_METADATA" 1539 diff --git a/config/android/abi.gni b/config/android/abi.gni 1540 index 8f6c5b199..c300f1d6f 100644 1541 --- a/config/android/abi.gni 1542 +++ b/config/android/abi.gni 1543 @@ -41,7 +41,7 @@ if (current_cpu == "x86") { 1544 android_abi_target = "i686-linux-android" 1545 sanitizer_arch = "i686" 1546 } else if (current_cpu == "arm") { 1547 - import("//build/config/arm.gni") 1548 + import("//chromium/build/config/arm.gni") 1549 if (arm_version < 7) { 1550 android_app_abi = "armeabi" 1551 } else { 1552 @@ -107,6 +107,6 @@ if (enable_android_secondary_abi) { 1553 1554 if (defined(android_secondary_abi_cpu)) { 1555 android_secondary_abi_toolchain = 1556 - "//build/toolchain/android:android_clang_${android_secondary_abi_cpu}" 1557 + "//chromium/build/toolchain/android:android_clang_${android_secondary_abi_cpu}" 1558 } 1559 } 1560 diff --git a/config/android/android_nocompile.gni b/config/android/android_nocompile.gni 1561 index 0b3f517bd..912cea490 100644 1562 --- a/config/android/android_nocompile.gni 1563 +++ b/config/android/android_nocompile.gni 1564 @@ -2,7 +2,7 @@ 1565 # Use of this source code is governed by a BSD-style license that can be 1566 # found in the LICENSE file. 1567 1568 -import("//build/config/android/rules.gni") 1569 +import("//chromium/build/config/android/rules.gni") 1570 1571 declare_args() { 1572 # Used by tests to enable generating build files for GN targets which should 1573 @@ -33,8 +33,8 @@ template("android_nocompile_test_suite") { 1574 1575 action(target_name) { 1576 testonly = true 1577 - script = "//build/android/gyp/nocompile_test.py" 1578 - pool = "//build/config/android:nocompile_pool" 1579 + script = "//chromium/build/android/gyp/nocompile_test.py" 1580 + pool = "//chromium/build/config/android:nocompile_pool" 1581 1582 _tests = invoker.tests 1583 _test0 = _tests[0] 1584 @@ -58,7 +58,7 @@ template("android_nocompile_test_suite") { 1585 1586 # Depend on compile_java Python scripts so that the action is re-run whenever the script is 1587 # modified. 1588 - _pydeps = [ "//build/android/gyp/compile_java.pydeps" ] 1589 + _pydeps = [ "//chromium/build/android/gyp/compile_java.pydeps" ] 1590 if (defined(invoker.pydeps)) { 1591 _pydeps += invoker.pydeps 1592 } 1593 diff --git a/config/android/build_vars.gni b/config/android/build_vars.gni 1594 index f394dfc6d..de6c3595d 100644 1595 --- a/config/android/build_vars.gni 1596 +++ b/config/android/build_vars.gni 1597 @@ -2,7 +2,7 @@ 1598 # Use of this source code is governed by a BSD-style license that can be 1599 # found in the LICENSE file. 1600 1601 -import("//build/config/android/config.gni") 1602 +import("//chromium/build/config/android/config.gni") 1603 1604 # Contains useful GN variables that may be used by scripts that take 1605 # --output-directory as an arg. 1606 diff --git a/config/android/config.gni b/config/android/config.gni 1607 index e9b3014f2..92251bb69 100644 1608 --- a/config/android/config.gni 1609 +++ b/config/android/config.gni 1610 @@ -26,14 +26,14 @@ assert(!(incremental_install && !is_java_debug), 1611 "Cannot have incremental_install without is_java_debug") 1612 1613 # Toolchain used to create native libraries for robolectric_binary() targets. 1614 -robolectric_toolchain = "//build/toolchain/android:robolectric_$host_cpu" 1615 +robolectric_toolchain = "//chromium/build/toolchain/android:robolectric_$host_cpu" 1616 1617 if (is_android) { 1618 - import("//build/config/android/channel.gni") 1619 - import("//build/config/clang/clang.gni") 1620 - import("//build/config/dcheck_always_on.gni") 1621 - import("//build/config/sanitizers/sanitizers.gni") 1622 - import("//build/toolchain/siso.gni") 1623 + import("//chromium/build/config/android/channel.gni") 1624 + import("//chromium/build/config/clang/clang.gni") 1625 + import("//chromium/build/config/dcheck_always_on.gni") 1626 + import("//chromium/build/config/sanitizers/sanitizers.gni") 1627 + import("//chromium/build/toolchain/siso.gni") 1628 import("//build_overrides/build.gni") 1629 import("abi.gni") 1630 1631 @@ -41,7 +41,7 @@ if (is_android) { 1632 # Some non-chromium projects (e.g. WebRTC) use our build configs 1633 # heavily but don't write gclient args files. 1634 1635 - import("//build/config/gclient_args.gni") 1636 + import("//chromium/build/config/gclient_args.gni") 1637 if (defined(checkout_android)) { 1638 n = "$0x0A" # Newline 1639 assert(checkout_android, 1640 @@ -113,7 +113,7 @@ if (is_android) { 1641 if (enable_chrome_android_internal) { 1642 import("//clank/config.gni") 1643 } else { 1644 - import("//build/config/android/sdk.gni") 1645 + import("//chromium/build/config/android/sdk.gni") 1646 declare_args() { 1647 # Which Android SDK to use. 1648 android_sdk_release = default_android_sdk_release 1649 @@ -158,7 +158,7 @@ if (is_android) { 1650 } 1651 1652 if (!defined(default_android_keystore_path)) { 1653 - default_android_keystore_path = "//build/android/chromium-debug.keystore" 1654 + default_android_keystore_path = "//chromium/build/android/chromium-debug.keystore" 1655 default_android_keystore_name = "chromiumdebugkey" 1656 default_android_keystore_password = "chromium" 1657 } 1658 diff --git a/config/android/copy_ex.gni b/config/android/copy_ex.gni 1659 index 8e70c3014..d28224bbf 100644 1660 --- a/config/android/copy_ex.gni 1661 +++ b/config/android/copy_ex.gni 1662 @@ -19,7 +19,7 @@ 1663 # The following variables have the usual GN meaning: data, deps, inputs, 1664 # outputs, testonly, visibility. 1665 1666 -import("//build/config/python.gni") 1667 +import("//chromium/build/config/python.gni") 1668 1669 template("copy_ex") { 1670 action_with_pydeps(target_name) { 1671 @@ -43,7 +43,7 @@ template("copy_ex") { 1672 inputs = invoker.inputs 1673 } 1674 1675 - script = "//build/android/gyp/copy_ex.py" 1676 + script = "//chromium/build/android/gyp/copy_ex.py" 1677 1678 args = [ 1679 "--dest", 1680 diff --git a/config/android/create_unwind_table.gni b/config/android/create_unwind_table.gni 1681 index 59cb024a8..ac264af40 100644 1682 --- a/config/android/create_unwind_table.gni 1683 +++ b/config/android/create_unwind_table.gni 1684 @@ -2,7 +2,7 @@ 1685 # Use of this source code is governed by a BSD-style license that can be 1686 # found in the LICENSE file. 1687 1688 -import("//build/config/android/rules.gni") 1689 +import("//chromium/build/config/android/rules.gni") 1690 1691 unwind_table_asset_v2_filename = "unwind_cfi_32_v2" 1692 1693 @@ -26,7 +26,7 @@ template("unwind_table_v2") { 1694 "") 1695 _library_path = "$root_out_dir/lib.unstripped/$shlib_prefix$_library_name$shlib_extension" 1696 1697 - script = "//build/android/gyp/create_unwind_table.py" 1698 + script = "//chromium/build/android/gyp/create_unwind_table.py" 1699 outputs = [ _output_path ] 1700 inputs = [ 1701 _dump_syms, 1702 diff --git a/config/android/extract_unwind_tables.gni b/config/android/extract_unwind_tables.gni 1703 index 6518a2d3a..20ea336fe 100644 1704 --- a/config/android/extract_unwind_tables.gni 1705 +++ b/config/android/extract_unwind_tables.gni 1706 @@ -2,7 +2,7 @@ 1707 # Use of this source code is governed by a BSD-style license that can be 1708 # found in the LICENSE file. 1709 1710 -import("//build/config/android/rules.gni") 1711 +import("//chromium/build/config/android/rules.gni") 1712 1713 unwind_table_asset_v1_filename = "unwind_cfi_32" 1714 1715 @@ -25,7 +25,7 @@ template("unwind_table_v1") { 1716 "") 1717 _library_path = "$root_out_dir/lib.unstripped/$shlib_prefix$_library_name$shlib_extension" 1718 1719 - script = "//build/android/gyp/extract_unwind_tables.py" 1720 + script = "//chromium/build/android/gyp/extract_unwind_tables.py" 1721 outputs = [ _output_path ] 1722 inputs = [ 1723 _dump_syms, 1724 diff --git a/config/android/internal_rules.gni b/config/android/internal_rules.gni 1725 index c28730b18..d7d23b24c 100644 1726 --- a/config/android/internal_rules.gni 1727 +++ b/config/android/internal_rules.gni 1728 @@ -4,18 +4,18 @@ 1729 1730 # Do not add any imports to non-//build directories here. 1731 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 1732 -import("//build/config/android/channel.gni") 1733 -import("//build/config/android/config.gni") 1734 -import("//build/config/compiler/compiler.gni") 1735 -import("//build/config/compute_inputs_for_analyze.gni") 1736 -import("//build/config/coverage/coverage.gni") 1737 -import("//build/config/python.gni") 1738 -import("//build/config/sanitizers/sanitizers.gni") 1739 -import("//build/toolchain/kythe.gni") 1740 -import("//build/util/generate_wrapper.gni") 1741 +import("//chromium/build/config/android/channel.gni") 1742 +import("//chromium/build/config/android/config.gni") 1743 +import("//chromium/build/config/compiler/compiler.gni") 1744 +import("//chromium/build/config/compute_inputs_for_analyze.gni") 1745 +import("//chromium/build/config/coverage/coverage.gni") 1746 +import("//chromium/build/config/python.gni") 1747 +import("//chromium/build/config/sanitizers/sanitizers.gni") 1748 +import("//chromium/build/toolchain/kythe.gni") 1749 +import("//chromium/build/util/generate_wrapper.gni") 1750 import("//build_overrides/build.gni") 1751 if (current_toolchain == default_toolchain) { 1752 - import("//build/toolchain/concurrent_links.gni") 1753 + import("//chromium/build/toolchain/concurrent_links.gni") 1754 } 1755 assert(is_android) 1756 1757 @@ -160,7 +160,7 @@ template("write_build_config") { 1758 deps += [ invoker.android_manifest_dep ] 1759 } 1760 1761 - script = "//build/android/gyp/write_build_config.py" 1762 + script = "//chromium/build/android/gyp/write_build_config.py" 1763 depfile = "$target_gen_dir/$target_name.d" 1764 inputs = [] 1765 outputs = [ invoker.build_config ] 1766 @@ -679,11 +679,11 @@ template("generate_android_wrapper") { 1767 generate_wrapper(target_name) { 1768 forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY) 1769 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY) 1770 - generator_script = "//build/android/gyp/generate_android_wrapper.py" 1771 + generator_script = "//chromium/build/android/gyp/generate_android_wrapper.py" 1772 sources = [ 1773 - "//build/android/gyp/util/build_utils.py", 1774 - "//build/gn_helpers.py", 1775 - "//build/util/generate_wrapper.py", 1776 + "//chromium/build/android/gyp/util/build_utils.py", 1777 + "//chromium/build/gn_helpers.py", 1778 + "//chromium/build/util/generate_wrapper.py", 1779 ] 1780 } 1781 } 1782 @@ -695,7 +695,7 @@ template("generate_r_java") { 1783 inputs = [ invoker.build_config ] 1784 outputs = [ invoker.srcjar_path ] 1785 _rebased_build_config = rebase_path(invoker.build_config, root_build_dir) 1786 - script = "//build/android/gyp/create_r_java.py" 1787 + script = "//chromium/build/android/gyp/create_r_java.py" 1788 args = [ 1789 "--depfile", 1790 rebase_path(depfile, root_build_dir), 1791 @@ -782,7 +782,7 @@ template("test_runner_script") { 1792 if (defined(invoker.android_test_runner_script)) { 1793 _runner_script = invoker.android_test_runner_script 1794 } else { 1795 - _runner_script = "//build/android/test_runner.py" 1796 + _runner_script = "//chromium/build/android/test_runner.py" 1797 } 1798 1799 deps = [] 1800 @@ -790,11 +790,11 @@ template("test_runner_script") { 1801 deps = invoker.deps 1802 } 1803 data_deps = [ 1804 - "//build/android:test_runner_core_py", 1805 + "//chromium/build/android:test_runner_core_py", 1806 "//testing:test_scripts_shared", 1807 ] 1808 if (_test_type != "junit") { 1809 - data_deps += [ "//build/android:test_runner_device_support" ] 1810 + data_deps += [ "//chromium/build/android:test_runner_device_support" ] 1811 } 1812 if (defined(invoker.data_deps)) { 1813 data_deps += invoker.data_deps 1814 @@ -1072,9 +1072,9 @@ if (enable_java_templates) { 1815 1816 # https://crbug.com/1098752 Fix for bot OOM (https://crbug.com/1098333). 1817 if (defined(java_cmd_pool_size)) { 1818 - pool = "//build/config/android:java_cmd_pool($default_toolchain)" 1819 + pool = "//chromium/build/config/android:java_cmd_pool($default_toolchain)" 1820 } else { 1821 - pool = "//build/toolchain:link_pool($default_toolchain)" 1822 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 1823 } 1824 1825 # Lint requires generated sources and generated resources from the build. 1826 @@ -1124,7 +1124,7 @@ if (enable_java_templates) { 1827 } 1828 _backported_methods = "//third_party/r8/backported_methods.txt" 1829 1830 - script = "//build/android/gyp/lint.py" 1831 + script = "//chromium/build/android/gyp/lint.py" 1832 depfile = "$target_gen_dir/$target_name.d" 1833 inputs = java_paths_for_inputs + [ 1834 _lint_jar_path, 1835 @@ -1211,7 +1211,7 @@ if (enable_java_templates) { 1836 _stamp_path = "$target_out_dir/$target_name/build.lint.stamp" 1837 deps += [ invoker.build_config_dep ] 1838 if (!_use_custom_cache_dir) { 1839 - deps += [ "//build/android:prepare_android_lint_cache" ] 1840 + deps += [ "//chromium/build/android:prepare_android_lint_cache" ] 1841 inputs += [ _create_cache_stamp_path ] 1842 } 1843 inputs += [ invoker.build_config ] 1844 @@ -1247,7 +1247,7 @@ if (enable_java_templates) { 1845 action_with_pydeps(target_name) { 1846 forward_variables_from(invoker, 1847 TESTONLY_AND_VISIBILITY + [ "public_deps" ]) 1848 - script = "//build/android/gyp/tracereferences.py" 1849 + script = "//chromium/build/android/gyp/tracereferences.py" 1850 inputs = java_paths_for_inputs + [ 1851 _r8_path, 1852 invoker.tracerefs_json, 1853 @@ -1273,7 +1273,7 @@ if (enable_java_templates) { 1854 1855 template("proguard") { 1856 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY) 1857 - _script = "//build/android/gyp/proguard.py" 1858 + _script = "//chromium/build/android/gyp/proguard.py" 1859 _deps = invoker.deps 1860 1861 _inputs = java_paths_for_inputs + [ 1862 @@ -1505,9 +1505,9 @@ if (enable_java_templates) { 1863 1864 # http://crbug.com/725224. Fix for bots running out of memory. 1865 if (defined(java_cmd_pool_size)) { 1866 - pool = "//build/config/android:java_cmd_pool($default_toolchain)" 1867 + pool = "//chromium/build/config/android:java_cmd_pool($default_toolchain)" 1868 } else { 1869 - pool = "//build/toolchain:link_pool($default_toolchain)" 1870 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 1871 } 1872 } 1873 1874 @@ -1541,7 +1541,7 @@ if (enable_java_templates) { 1875 _max_heap_size = "1G" 1876 } 1877 1878 - script = "//build/android/gyp/create_java_binary_script.py" 1879 + script = "//chromium/build/android/gyp/create_java_binary_script.py" 1880 inputs = [ _build_config ] 1881 _java_script = "$root_build_dir/bin/$_script_name" 1882 outputs = [ _java_script ] 1883 @@ -1684,7 +1684,7 @@ if (enable_java_templates) { 1884 "data", 1885 "data_deps", 1886 ]) 1887 - script = "//build/android/gyp/dex.py" 1888 + script = "//chromium/build/android/gyp/dex.py" 1889 deps = _deps 1890 depfile = "$target_gen_dir/$target_name.d" 1891 outputs = [ invoker.output ] 1892 @@ -1704,9 +1704,9 @@ if (enable_java_templates) { 1893 if (!_is_library) { 1894 # http://crbug.com/725224. Fix for bots running out of memory. 1895 if (defined(java_cmd_pool_size)) { 1896 - pool = "//build/config/android:java_cmd_pool($default_toolchain)" 1897 + pool = "//chromium/build/config/android:java_cmd_pool($default_toolchain)" 1898 } else { 1899 - pool = "//build/toolchain:link_pool($default_toolchain)" 1900 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 1901 } 1902 } 1903 1904 @@ -1827,7 +1827,7 @@ if (enable_java_templates) { 1905 _sources_json_file = "$target_out_dir/${target_name}__jacoco_sources.json" 1906 _jacococli_jar = "//third_party/jacoco/cipd/lib/jacococli.jar" 1907 1908 - script = "//build/android/gyp/jacoco_instr.py" 1909 + script = "//chromium/build/android/gyp/jacoco_instr.py" 1910 inputs = invoker.source_files + java_paths_for_inputs + [ 1911 _jacococli_jar, 1912 invoker.input_jar_path, 1913 @@ -1861,7 +1861,7 @@ if (enable_java_templates) { 1914 1915 template("filter_jar") { 1916 action_with_pydeps(target_name) { 1917 - script = "//build/android/gyp/filter_zip.py" 1918 + script = "//chromium/build/android/gyp/filter_zip.py" 1919 forward_variables_from(invoker, 1920 TESTONLY_AND_VISIBILITY + [ 1921 "deps", 1922 @@ -1947,7 +1947,7 @@ if (enable_java_templates) { 1923 "data_deps", 1924 "deps", 1925 ]) 1926 - script = "//build/android/gyp/check_for_missing_direct_deps.py" 1927 + script = "//chromium/build/android/gyp/check_for_missing_direct_deps.py" 1928 inputs = java_paths_for_inputs + [ 1929 invoker.build_config, 1930 invoker.input_jar, 1931 @@ -1992,7 +1992,7 @@ if (enable_java_templates) { 1932 invoker.min_sdk_version >= min_supported_sdk_version, 1933 get_label_info(":$target_name", "label_no_toolchain") + " has an unsupported min_sdk_version of ${invoker.min_sdk_version} (min is $min_supported_sdk_version)") 1934 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "deps" ]) 1935 - script = "//build/android/gyp/merge_manifest.py" 1936 + script = "//chromium/build/android/gyp/merge_manifest.py" 1937 depfile = "$target_gen_dir/$target_name.d" 1938 1939 inputs = java_paths_for_inputs + [ 1940 @@ -2072,7 +2072,7 @@ if (enable_java_templates) { 1941 "public_deps", 1942 "sources", 1943 ]) 1944 - script = "//build/android/gyp/prepare_resources.py" 1945 + script = "//chromium/build/android/gyp/prepare_resources.py" 1946 1947 depfile = "$target_gen_dir/${invoker.target_name}.d" 1948 outputs = [ 1949 @@ -2223,7 +2223,7 @@ if (enable_java_templates) { 1950 } 1951 _final_srcjar_path = "${target_gen_dir}/${target_name}.srcjar" 1952 1953 - _script = "//build/android/gyp/compile_resources.py" 1954 + _script = "//chromium/build/android/gyp/compile_resources.py" 1955 1956 _target_sdk_version = invoker.target_sdk_version 1957 if (defined(invoker.override_target_sdk)) { 1958 @@ -2607,7 +2607,7 @@ if (enable_java_templates) { 1959 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY) 1960 action_with_pydeps(target_name) { 1961 forward_variables_from(invoker, [ "deps" ]) 1962 - script = "//build/android/gyp/optimize_resources.py" 1963 + script = "//chromium/build/android/gyp/optimize_resources.py" 1964 inputs = [ 1965 android_sdk_tools_bundle_aapt2, 1966 invoker.r_text_path, 1967 @@ -2669,7 +2669,7 @@ if (enable_java_templates) { 1968 template("unused_resources") { 1969 action_with_pydeps(target_name) { 1970 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "deps" ]) 1971 - script = "//build/android/gyp/unused_resources.py" 1972 + script = "//chromium/build/android/gyp/unused_resources.py" 1973 depfile = "$target_gen_dir/${target_name}.d" 1974 _unused_resources_script = "$root_build_dir/bin/helper/unused_resources" 1975 inputs = [ _unused_resources_script ] + java_paths_for_inputs 1976 @@ -2677,7 +2677,7 @@ if (enable_java_templates) { 1977 if (!defined(deps)) { 1978 deps = [] 1979 } 1980 - deps += [ "//build/android/unused_resources:unused_resources" ] 1981 + deps += [ "//chromium/build/android/unused_resources:unused_resources" ] 1982 _rebased_build_config = rebase_path(invoker.build_config, root_build_dir) 1983 args = [ 1984 "--script", 1985 @@ -2736,7 +2736,7 @@ if (enable_java_templates) { 1986 template("create_size_info_files") { 1987 action_with_pydeps(target_name) { 1988 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "deps" ]) 1989 - script = "//build/android/gyp/create_size_info_files.py" 1990 + script = "//chromium/build/android/gyp/create_size_info_files.py" 1991 _jar_info_path = "$root_build_dir/size-info/${invoker.name}.jar.info" 1992 _pak_info_path = "$root_build_dir/size-info/${invoker.name}.pak.info" 1993 _res_info_path = "$root_build_dir/size-info/${invoker.name}.res.info" 1994 @@ -2830,7 +2830,7 @@ if (enable_java_templates) { 1995 invoker.secondary_native_lib_placeholders 1996 } 1997 1998 - _script = "//build/android/gyp/apkbuilder.py" 1999 + _script = "//chromium/build/android/gyp/apkbuilder.py" 2000 2001 _inputs = [ invoker.packaged_resources_path ] 2002 2003 @@ -3103,16 +3103,16 @@ if (enable_java_templates) { 2004 2005 action_with_pydeps(target_name) { 2006 if (invoker.use_turbine) { 2007 - script = "//build/android/gyp/turbine.py" 2008 + script = "//chromium/build/android/gyp/turbine.py" 2009 inputs = [ 2010 "//third_party/jdk/current/bin/java", 2011 android_sdk_jar, 2012 ] 2013 } else if (invoker.enable_errorprone) { 2014 - script = "//build/android/gyp/errorprone.py" 2015 + script = "//chromium/build/android/gyp/errorprone.py" 2016 inputs = javac_paths_for_inputs 2017 } else { 2018 - script = "//build/android/gyp/compile_java.py" 2019 + script = "//chromium/build/android/gyp/compile_java.py" 2020 inputs = javac_paths_for_inputs 2021 } 2022 2023 @@ -3329,7 +3329,7 @@ if (enable_java_templates) { 2024 } 2025 2026 action_with_pydeps(target_name) { 2027 - script = "//build/android/gyp/compile_kt.py" 2028 + script = "//chromium/build/android/gyp/compile_kt.py" 2029 depfile = "$target_gen_dir/$target_name.d" 2030 deps = _srcjar_deps 2031 if (defined(invoker.deps)) { 2032 @@ -3399,7 +3399,7 @@ if (enable_java_templates) { 2033 "data_deps", 2034 "public_deps", 2035 ]) 2036 - script = "//build/android/gyp/ijar.py" 2037 + script = "//chromium/build/android/gyp/ijar.py" 2038 deps = [ _ijar_target ] 2039 if (defined(invoker.deps)) { 2040 deps += invoker.deps 2041 @@ -3591,8 +3591,8 @@ if (enable_java_templates) { 2042 } 2043 } 2044 2045 - if (_chromium_code && _has_sources && _target_dir != "//build/android") { 2046 - _default_deps = [ "//build/android:build_java" ] 2047 + if (_chromium_code && _has_sources && _target_dir != "//chromium/build/android") { 2048 + _default_deps = [ "//chromium/build/android:build_java" ] 2049 } else { 2050 _default_deps = [] 2051 } 2052 @@ -4149,7 +4149,7 @@ if (enable_java_templates) { 2053 get_label_info(invoker.bytecode_rewriter_target, "name") 2054 _rebased_build_config = rebase_path(_build_config, root_build_dir) 2055 action_with_pydeps(_rewritten_jar_target_name) { 2056 - script = "//build/android/gyp/bytecode_rewriter.py" 2057 + script = "//chromium/build/android/gyp/bytecode_rewriter.py" 2058 inputs = java_paths_for_inputs + [ 2059 _rewriter_path, 2060 _build_config, 2061 @@ -4536,7 +4536,7 @@ template("create_android_app_bundle_module") { 2062 2063 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY) 2064 _deps = invoker.deps 2065 - _script = "//build/android/gyp/apkbuilder.py" 2066 + _script = "//chromium/build/android/gyp/apkbuilder.py" 2067 2068 # NOTE: Compared to the inputs of the "package_apk" template action, 2069 # this list is much smaller, since finalize_apk is never called 2070 @@ -4664,7 +4664,7 @@ template("rename_jar_classes") { 2071 "deps", 2072 "public_deps", 2073 ]) 2074 - script = "//build/android/gyp/rename_java_classes.py" 2075 + script = "//chromium/build/android/gyp/rename_java_classes.py" 2076 inputs = [ 2077 _r8_path, 2078 invoker.input, 2079 diff --git a/config/android/linker_version_script.gni b/config/android/linker_version_script.gni 2080 index facf3a3cf..6a13536e9 100644 2081 --- a/config/android/linker_version_script.gni 2082 +++ b/config/android/linker_version_script.gni 2083 @@ -2,8 +2,8 @@ 2084 # Use of this source code is governed by a BSD-style license that can be 2085 # found in the LICENSE file. 2086 2087 -import("//build/config/android/config.gni") 2088 -import("//build/config/python.gni") 2089 +import("//chromium/build/config/android/config.gni") 2090 +import("//chromium/build/config/python.gni") 2091 if (build_with_chromium) { 2092 import("//third_party/jni_zero/jni_zero.gni") 2093 } 2094 @@ -21,7 +21,7 @@ if (build_with_chromium) { 2095 template("generate_linker_version_script") { 2096 action_with_pydeps(target_name) { 2097 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY) 2098 - script = "//build/android/gyp/generate_linker_version_script.py" 2099 + script = "//chromium/build/android/gyp/generate_linker_version_script.py" 2100 outputs = [ invoker.linker_script ] 2101 inputs = [] 2102 args = [ "--output=" + rebase_path(invoker.linker_script, root_build_dir) ] 2103 diff --git a/config/android/rules.gni b/config/android/rules.gni 2104 index c3c62337a..8fc2e6feb 100644 2105 --- a/config/android/rules.gni 2106 +++ b/config/android/rules.gni 2107 @@ -2,12 +2,12 @@ 2108 # Use of this source code is governed by a BSD-style license that can be 2109 # found in the LICENSE file. 2110 2111 -import("//build/config/android/abi.gni") 2112 -import("//build/config/android/copy_ex.gni") 2113 -import("//build/config/chrome_build.gni") 2114 -import("//build/config/clang/clang.gni") 2115 -import("//build/config/rts.gni") 2116 -import("//build/config/sanitizers/sanitizers.gni") 2117 +import("//chromium/build/config/android/abi.gni") 2118 +import("//chromium/build/config/android/copy_ex.gni") 2119 +import("//chromium/build/config/chrome_build.gni") 2120 +import("//chromium/build/config/clang/clang.gni") 2121 +import("//chromium/build/config/rts.gni") 2122 +import("//chromium/build/config/sanitizers/sanitizers.gni") 2123 import("//build_overrides/build.gni") 2124 2125 assert( 2126 @@ -108,14 +108,14 @@ template("create_native_executable_dist") { 2127 } 2128 2129 if (!is_robolectric && enable_java_templates) { 2130 - import("//build/config/android/config.gni") 2131 - import("//build/config/android/internal_rules.gni") 2132 - import("//build/config/compiler/compiler.gni") 2133 - import("//build/config/coverage/coverage.gni") 2134 - import("//build/config/profiling/profiling.gni") 2135 - import("//build/config/python.gni") 2136 - import("//build/config/zip.gni") 2137 - import("//build/toolchain/toolchain.gni") 2138 + import("//chromium/build/config/android/config.gni") 2139 + import("//chromium/build/config/android/internal_rules.gni") 2140 + import("//chromium/build/config/compiler/compiler.gni") 2141 + import("//chromium/build/config/coverage/coverage.gni") 2142 + import("//chromium/build/config/profiling/profiling.gni") 2143 + import("//chromium/build/config/python.gni") 2144 + import("//chromium/build/config/zip.gni") 2145 + import("//chromium/build/toolchain/toolchain.gni") 2146 2147 _BUNDLETOOL_JAR_PATH = 2148 "//third_party/android_build_tools/bundletool/cipd/bundletool.jar" 2149 @@ -163,7 +163,7 @@ if (!is_robolectric && enable_java_templates) { 2150 "testonly", 2151 "visibility", 2152 ]) 2153 - script = "//build/android/gyp/gcc_preprocess.py" 2154 + script = "//chromium/build/android/gyp/gcc_preprocess.py" 2155 outputs = [ "$target_gen_dir/$target_name.srcjar" ] 2156 2157 _include_dirs = [ 2158 @@ -213,7 +213,7 @@ if (!is_robolectric && enable_java_templates) { 2159 2160 # The sources aren't compiled so don't check their dependencies. 2161 check_includes = false 2162 - script = "//build/android/gyp/java_cpp_enum.py" 2163 + script = "//chromium/build/android/gyp/java_cpp_enum.py" 2164 2165 _srcjar_path = "${target_gen_dir}/${target_name}.srcjar" 2166 _rebased_srcjar_path = rebase_path(_srcjar_path, root_build_dir) 2167 @@ -277,7 +277,7 @@ if (!is_robolectric && enable_java_templates) { 2168 2169 # The sources aren't compiled so don't check their dependencies. 2170 check_includes = false 2171 - script = "//build/android/gyp/java_cpp_strings.py" 2172 + script = "//chromium/build/android/gyp/java_cpp_strings.py" 2173 2174 _srcjar_path = "${target_gen_dir}/${target_name}.srcjar" 2175 _rebased_srcjar_path = rebase_path(_srcjar_path, root_build_dir) 2176 @@ -350,7 +350,7 @@ if (!is_robolectric && enable_java_templates) { 2177 2178 # The sources aren't compiled so don't check their dependencies. 2179 check_includes = false 2180 - script = "//build/android/gyp/java_cpp_features.py" 2181 + script = "//chromium/build/android/gyp/java_cpp_features.py" 2182 2183 _srcjar_path = "${target_gen_dir}/${target_name}.srcjar" 2184 _rebased_srcjar_path = rebase_path(_srcjar_path, root_build_dir) 2185 @@ -389,7 +389,7 @@ if (!is_robolectric && enable_java_templates) { 2186 if (defined(invoker.includes)) { 2187 inputs += invoker.includes 2188 } 2189 - script = "//build/android/gyp/jinja_template.py" 2190 + script = "//chromium/build/android/gyp/jinja_template.py" 2191 2192 outputs = [ invoker.output ] 2193 2194 @@ -442,7 +442,7 @@ if (!is_robolectric && enable_java_templates) { 2195 2196 action_with_pydeps(target_name) { 2197 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "deps" ]) 2198 - script = "//build/android/gyp/write_native_libraries_java.py" 2199 + script = "//chromium/build/android/gyp/write_native_libraries_java.py" 2200 outputs = [ _native_libraries_file ] 2201 args = [ 2202 "--output", 2203 @@ -502,7 +502,7 @@ if (!is_robolectric && enable_java_templates) { 2204 # 2205 # action("my_resources__create_zip") { 2206 # _depfile = "$target_gen_dir/${target_name}.d" 2207 - # script = "//build/path/to/create_my_resources_zip.py" 2208 + # script = "//chromium/build/path/to/create_my_resources_zip.py" 2209 # args = [ 2210 # "--depfile", rebase_path(_depfile, root_build_dir), 2211 # "--output-zip", rebase_path(_zip_archive, root_build_dir), 2212 @@ -540,7 +540,7 @@ if (!is_robolectric && enable_java_templates) { 2213 ] 2214 inputs = [ invoker.generated_resources_zip ] 2215 outputs = [ _rtxt_out_path ] 2216 - script = "//build/android/gyp/create_r_txt.py" 2217 + script = "//chromium/build/android/gyp/create_r_txt.py" 2218 args = [ 2219 "--resources-zip-path", 2220 rebase_path(invoker.generated_resources_zip, root_build_dir), 2221 @@ -578,7 +578,7 @@ if (!is_robolectric && enable_java_templates) { 2222 action_with_pydeps(_generating_target_name) { 2223 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "deps" ]) 2224 inputs = invoker.resources 2225 - script = "//build/android/gyp/jinja_template.py" 2226 + script = "//chromium/build/android/gyp/jinja_template.py" 2227 2228 outputs = [ _resources_zip ] 2229 2230 @@ -632,7 +632,7 @@ if (!is_robolectric && enable_java_templates) { 2231 "deps", 2232 "testonly", 2233 ]) 2234 - script = "//build/android/gyp/process_native_prebuilt.py" 2235 + script = "//chromium/build/android/gyp/process_native_prebuilt.py" 2236 _lib_path = "${invoker.base_dir}/$android_app_abi/${invoker.lib_name}" 2237 _stripped_output_path = "$root_out_dir/${invoker.lib_name}" 2238 _unstripped_output_path = 2239 @@ -929,7 +929,7 @@ if (!is_robolectric && enable_java_templates) { 2240 forward_variables_from(invoker, [ "deps" ]) 2241 public_deps = [ ":$_build_config_target_name" ] 2242 2243 - script = "//build/android/gyp/validate_inputs.py" 2244 + script = "//chromium/build/android/gyp/validate_inputs.py" 2245 inputs = _all_sources 2246 outputs = [ "$target_gen_dir/$target_name.stamp" ] 2247 args = [ 2248 @@ -1145,7 +1145,7 @@ if (!is_robolectric && enable_java_templates) { 2249 if (defined(invoker.android_manifest)) { 2250 input_manifest = invoker.android_manifest 2251 } else { 2252 - input_manifest = "//build/android/AndroidManifest.xml" 2253 + input_manifest = "//chromium/build/android/AndroidManifest.xml" 2254 } 2255 2256 if (defined(_package_name)) { 2257 @@ -1276,7 +1276,7 @@ if (!is_robolectric && enable_java_templates) { 2258 } 2259 srcjar_deps += [ 2260 ":$_compile_resources_target_name", 2261 - "//build/android:build_config_for_robolectric_srcjar", 2262 + "//chromium/build/android:build_config_for_robolectric_srcjar", 2263 ] 2264 if (_generate_final_jni) { 2265 srcjar_deps += [ ":$_native_libraries_target_name" ] + _jni_srcjar_deps 2266 @@ -1526,7 +1526,7 @@ if (!is_robolectric && enable_java_templates) { 2267 _rebased_build_config = rebase_path(_build_config, root_build_dir) 2268 action_with_pydeps(_zip_target_name) { 2269 forward_variables_from(invoker, [ "data" ]) 2270 - script = "//build/android/gyp/zip.py" 2271 + script = "//chromium/build/android/gyp/zip.py" 2272 depfile = "$target_gen_dir/$target_name.d" 2273 deps = [ _build_config_dep ] 2274 2275 @@ -1719,7 +1719,7 @@ if (!is_robolectric && enable_java_templates) { 2276 ]) 2277 depfile = "$target_gen_dir/$target_name.d" 2278 deps = _deps 2279 - script = "//build/android/gyp/dist_aar.py" 2280 + script = "//chromium/build/android/gyp/dist_aar.py" 2281 2282 inputs = [ _build_config ] 2283 2284 @@ -1928,7 +1928,7 @@ if (!is_robolectric && enable_java_templates) { 2285 "deps", 2286 "inputs", 2287 ]) 2288 - sources = [ "//build/android/java/templates/BuildConfig.template" ] 2289 + sources = [ "//chromium/build/android/java/templates/BuildConfig.template" ] 2290 defines = [] 2291 2292 if ((defined(invoker.assertions_implicitly_enabled) && 2293 @@ -2025,7 +2025,7 @@ if (!is_robolectric && enable_java_templates) { 2294 defines += [ "USE_FINAL" ] 2295 } 2296 2297 - sources = [ "//build/android/java/templates/ProductConfig.template" ] 2298 + sources = [ "//chromium/build/android/java/templates/ProductConfig.template" ] 2299 defines += [ "PACKAGE=${invoker.java_package}" ] 2300 2301 _use_chromium_linker = 2302 @@ -2379,7 +2379,7 @@ if (!is_robolectric && enable_java_templates) { 2303 action_with_pydeps(_incremental_manifest_target_name) { 2304 deps = [ ":$_merge_manifest_target" ] 2305 script = 2306 - "//build/android/incremental_install/generate_android_manifest.py" 2307 + "//chromium/build/android/incremental_install/generate_android_manifest.py" 2308 inputs = [ _android_manifest ] 2309 outputs = [ _incremental_android_manifest ] 2310 2311 @@ -2685,7 +2685,7 @@ if (!is_robolectric && enable_java_templates) { 2312 (_uses_static_library || _native_libs_deps != [])) { 2313 _sanitizer_loadable_modules += 2314 [ "$root_gen_dir/build/android/generate_wrap_sh/wrap.sh" ] 2315 - _sanitizer_deps += [ "//build/android:generate_wrap_sh" ] 2316 + _sanitizer_deps += [ "//chromium/build/android:generate_wrap_sh" ] 2317 } 2318 2319 _assertions_implicitly_enabled = defined(invoker.custom_assertion_handler) 2320 @@ -2892,7 +2892,7 @@ if (!is_robolectric && enable_java_templates) { 2321 # Injected JaCoCo code causes -checkdiscards to fail. 2322 !use_jacoco_coverage) { 2323 proguard_configs = [ 2324 - "//build/android/dcheck_is_off.flags", 2325 + "//chromium/build/android/dcheck_is_off.flags", 2326 "//third_party/jni_zero/checkdiscard_proguard.flags", 2327 ] 2328 } 2329 @@ -3028,7 +3028,7 @@ if (!is_robolectric && enable_java_templates) { 2330 } 2331 2332 if (_incremental_apk) { 2333 - _dex_target = "//build/android/incremental_install:apk_dex" 2334 + _dex_target = "//chromium/build/android/incremental_install:apk_dex" 2335 2336 deps += [ 2337 ":$_compile_resources_target", 2338 @@ -3085,7 +3085,7 @@ if (!is_robolectric && enable_java_templates) { 2339 if (_incremental_apk) { 2340 _write_installer_json_rule_name = "${_template_name}__incremental_json" 2341 action_with_pydeps(_write_installer_json_rule_name) { 2342 - script = "//build/android/incremental_install/write_installer_json.py" 2343 + script = "//chromium/build/android/incremental_install/write_installer_json.py" 2344 deps = [ ":$_build_config_target" ] + _all_native_libs_deps 2345 2346 data = [ _incremental_install_json_path ] 2347 @@ -3135,7 +3135,7 @@ if (!is_robolectric && enable_java_templates) { 2348 _apk_operations_target_name = "${target_name}__apk_operations" 2349 action_with_pydeps(_apk_operations_target_name) { 2350 _generated_script = "$root_build_dir/bin/${invoker.target_name}" 2351 - script = "//build/android/gyp/create_apk_operations_script.py" 2352 + script = "//chromium/build/android/gyp/create_apk_operations_script.py" 2353 outputs = [ _generated_script ] 2354 args = [ 2355 "--script-output-path", 2356 @@ -3172,13 +3172,13 @@ if (!is_robolectric && enable_java_templates) { 2357 } 2358 data = [] 2359 data_deps = [ 2360 - "//build/android:apk_operations_py", 2361 - "//build/android:stack_tools", 2362 + "//chromium/build/android:apk_operations_py", 2363 + "//chromium/build/android:stack_tools", 2364 ] 2365 2366 if (_proguard_enabled && !_incremental_apk) { 2367 # Required by logcat command. 2368 - data_deps += [ "//build/android/stacktrace:java_deobfuscate" ] 2369 + data_deps += [ "//chromium/build/android/stacktrace:java_deobfuscate" ] 2370 data += [ "$_final_apk_path.mapping" ] 2371 args += [ 2372 "--proguard-mapping-path", 2373 @@ -3568,7 +3568,7 @@ if (!is_robolectric && enable_java_templates) { 2374 template("instrumentation_test_runner") { 2375 if (use_rts) { 2376 action("${invoker.target_name}__rts_filters") { 2377 - script = "//build/add_rts_filters.py" 2378 + script = "//chromium/build/add_rts_filters.py" 2379 rts_file = "${root_build_dir}/gen/rts/${invoker.target_name}.filter" 2380 args = [ rebase_path(rts_file, root_build_dir) ] 2381 outputs = [ rts_file ] 2382 @@ -3587,7 +3587,7 @@ if (!is_robolectric && enable_java_templates) { 2383 2384 action_with_pydeps(_apk_operations_target_name) { 2385 testonly = true 2386 - script = "//build/android/gyp/create_test_apk_wrapper_script.py" 2387 + script = "//chromium/build/android/gyp/create_test_apk_wrapper_script.py" 2388 deps = [] 2389 _generated_script = "$root_build_dir/bin/${invoker.target_name}" 2390 outputs = [ _generated_script ] 2391 @@ -3906,7 +3906,7 @@ if (!is_robolectric && enable_java_templates) { 2392 2393 if (!defined(use_default_launcher) || use_default_launcher) { 2394 deps += [ 2395 - "//build/android/gtest_apk:native_test_instrumentation_test_runner_java", 2396 + "//chromium/build/android/gtest_apk:native_test_instrumentation_test_runner_java", 2397 "//testing/android/native_test:native_test_java", 2398 ] 2399 } 2400 @@ -3941,7 +3941,7 @@ if (!is_robolectric && enable_java_templates) { 2401 action_with_pydeps(target_name) { 2402 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY) 2403 2404 - script = "//build/android/gyp/aidl.py" 2405 + script = "//chromium/build/android/gyp/aidl.py" 2406 depfile = "$target_gen_dir/$target_name.d" 2407 sources = invoker.sources 2408 2409 @@ -4021,7 +4021,7 @@ if (!is_robolectric && enable_java_templates) { 2410 # The suffix "__protoc_java.srcjar" is used by SuperSize to identify 2411 # protobuf symbols. 2412 _srcjar_path = "$target_gen_dir/$target_name.srcjar" 2413 - script = "//build/protoc_java.py" 2414 + script = "//chromium/build/protoc_java.py" 2415 2416 if (defined(invoker.deps)) { 2417 # Need to care only about targets that might generate .proto files. 2418 @@ -4122,7 +4122,7 @@ if (!is_robolectric && enable_java_templates) { 2419 2420 action_with_pydeps("${_template_name}__flatc_java") { 2421 _srcjar_path = "$target_gen_dir/$target_name.srcjar" 2422 - script = "//build/android/gyp/flatc_java.py" 2423 + script = "//chromium/build/android/gyp/flatc_java.py" 2424 2425 deps = [ _flatc_dep ] 2426 if (defined(invoker.deps)) { 2427 @@ -4246,7 +4246,7 @@ if (!is_robolectric && enable_java_templates) { 2428 # Some libraries might not have resources; others might have two jars. 2429 if (update_android_aar_prebuilts) { 2430 print("Writing " + rebase_path(_info_path, "//")) 2431 - exec_script("//build/android/gyp/aar.py", 2432 + exec_script("//chromium/build/android/gyp/aar.py", 2433 [ 2434 "list", 2435 "--output", 2436 @@ -4293,7 +4293,7 @@ if (!is_robolectric && enable_java_templates) { 2437 } 2438 2439 action_with_pydeps(_unpack_target_name) { 2440 - script = "//build/android/gyp/aar.py" # Unzips the AAR 2441 + script = "//chromium/build/android/gyp/aar.py" # Unzips the AAR 2442 args = [ 2443 "extract", 2444 "--output-dir", 2445 @@ -4729,12 +4729,12 @@ if (!is_robolectric && enable_java_templates) { 2446 if (_proguard_enabled) { 2447 if (_add_view_trace_events) { 2448 _trace_event_rewriter_target = 2449 - "//build/android/bytecode:trace_event_adder" 2450 + "//chromium/build/android/bytecode:trace_event_adder" 2451 _rewritten_jar_target_name = "${target_name}__trace_event_rewritten" 2452 _rewriter_path = root_build_dir + "/bin/helper/trace_event_adder" 2453 _stamp = "${target_out_dir}/${target_name}.trace_event_rewrite.stamp" 2454 action_with_pydeps(_rewritten_jar_target_name) { 2455 - script = "//build/android/gyp/trace_event_bytecode_rewriter.py" 2456 + script = "//chromium/build/android/gyp/trace_event_bytecode_rewriter.py" 2457 inputs = java_paths_for_inputs + [ 2458 _rewriter_path, 2459 _build_config, 2460 @@ -4795,7 +4795,7 @@ if (!is_robolectric && enable_java_templates) { 2461 # Injected JaCoCo code causes -checkdiscards to fail. 2462 !use_jacoco_coverage) { 2463 proguard_configs = [ 2464 - "//build/android/dcheck_is_off.flags", 2465 + "//chromium/build/android/dcheck_is_off.flags", 2466 "//third_party/jni_zero/checkdiscard_proguard.flags", 2467 ] 2468 } 2469 @@ -4944,7 +4944,7 @@ if (!is_robolectric && enable_java_templates) { 2470 2471 _bundle_target_name = "${_target_name}__bundle" 2472 action_with_pydeps(_bundle_target_name) { 2473 - script = "//build/android/gyp/create_app_bundle.py" 2474 + script = "//chromium/build/android/gyp/create_app_bundle.py" 2475 inputs = _all_module_zip_paths + _all_module_build_configs + 2476 [ _BUNDLETOOL_JAR_PATH ] + java_paths_for_inputs 2477 outputs = [ _bundle_path ] 2478 @@ -5010,9 +5010,9 @@ if (!is_robolectric && enable_java_templates) { 2479 2480 # http://crbug.com/725224. Fix for bots running out of memory. 2481 if (defined(java_cmd_pool_size)) { 2482 - pool = "//build/config/android:java_cmd_pool($default_toolchain)" 2483 + pool = "//chromium/build/config/android:java_cmd_pool($default_toolchain)" 2484 } else { 2485 - pool = "//build/toolchain:link_pool($default_toolchain)" 2486 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 2487 } 2488 } 2489 2490 @@ -5049,7 +5049,7 @@ if (!is_robolectric && enable_java_templates) { 2491 _bundle_wrapper_script_path = "$_bundle_wrapper_script_dir/$_target_name" 2492 2493 action_with_pydeps("${_target_name}__wrapper_script") { 2494 - script = "//build/android/gyp/create_bundle_wrapper_script.py" 2495 + script = "//chromium/build/android/gyp/create_bundle_wrapper_script.py" 2496 inputs = [ _base_module_build_config ] 2497 outputs = [ _bundle_wrapper_script_path ] 2498 2499 @@ -5061,8 +5061,8 @@ if (!is_robolectric && enable_java_templates) { 2500 _bundle_path, 2501 ] 2502 data_deps = [ 2503 - "//build/android:apk_operations_py", 2504 - "//build/android:stack_tools", 2505 + "//chromium/build/android:apk_operations_py", 2506 + "//chromium/build/android:stack_tools", 2507 ] 2508 2509 deps = [ _base_module_build_config_target ] 2510 @@ -5117,7 +5117,7 @@ if (!is_robolectric && enable_java_templates) { 2511 ] 2512 2513 # Required by logcat command. 2514 - data_deps += [ "//build/android/stacktrace:java_deobfuscate" ] 2515 + data_deps += [ "//chromium/build/android/stacktrace:java_deobfuscate" ] 2516 data += [ _proguard_mapping_path ] 2517 } 2518 if (is_official_build) { 2519 @@ -5178,7 +5178,7 @@ if (!is_robolectric && enable_java_templates) { 2520 2521 _apks_path = "$root_build_dir/apks/$_bundle_name.apks" 2522 action_with_pydeps("${_target_name}_apks") { 2523 - script = "//build/android/gyp/create_app_bundle_apks.py" 2524 + script = "//chromium/build/android/gyp/create_app_bundle_apks.py" 2525 inputs = java_paths_for_inputs + [ 2526 _bundle_path, 2527 _BUNDLETOOL_JAR_PATH, 2528 @@ -5212,9 +5212,9 @@ if (!is_robolectric && enable_java_templates) { 2529 2530 # http://crbug.com/725224. Fix for bots running out of memory. 2531 if (defined(java_cmd_pool_size)) { 2532 - pool = "//build/config/android:java_cmd_pool($default_toolchain)" 2533 + pool = "//chromium/build/config/android:java_cmd_pool($default_toolchain)" 2534 } else { 2535 - pool = "//build/toolchain:link_pool($default_toolchain)" 2536 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 2537 } 2538 } 2539 } 2540 @@ -5236,7 +5236,7 @@ if (!is_robolectric && enable_java_templates) { 2541 template("create_app_bundle_minimal_apks") { 2542 action_with_pydeps(target_name) { 2543 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "deps" ]) 2544 - script = "//build/android/gyp/create_app_bundle_apks.py" 2545 + script = "//chromium/build/android/gyp/create_app_bundle_apks.py" 2546 _dir = get_path_info(invoker.bundle_path, "dir") 2547 _name = get_path_info(invoker.bundle_path, "name") 2548 _output_path = "$_dir/$_name.minimal.apks" 2549 @@ -5289,7 +5289,7 @@ if (!is_robolectric && enable_java_templates) { 2550 "${target_name}.zip" 2551 2552 action_with_pydeps(_generating_target_name) { 2553 - script = "//build/android/gyp/create_ui_locale_resources.py" 2554 + script = "//chromium/build/android/gyp/create_ui_locale_resources.py" 2555 outputs = [ _output_zip ] 2556 args = [ 2557 "--locale-list=${invoker.ui_locales}", 2558 diff --git a/config/android/system_image.gni b/config/android/system_image.gni 2559 index 56a235572..54d5cc29e 100644 2560 --- a/config/android/system_image.gni 2561 +++ b/config/android/system_image.gni 2562 @@ -2,7 +2,7 @@ 2563 # Use of this source code is governed by a BSD-style license that can be 2564 # found in the LICENSE file. 2565 2566 -import("//build/config/android/rules.gni") 2567 +import("//chromium/build/config/android/rules.gni") 2568 2569 # Creates a stub .apk suitable for use with compressed system APKs. 2570 # 2571 @@ -39,7 +39,7 @@ template("system_image_stub_apk") { 2572 } 2573 action_with_pydeps("$_manifest_target_name") { 2574 outputs = [ _manifest_path ] 2575 - script = "//build/android/gyp/create_stub_manifest.py" 2576 + script = "//chromium/build/android/gyp/create_stub_manifest.py" 2577 args = [ 2578 "--output", 2579 rebase_path(_manifest_path, root_build_dir), 2580 @@ -73,7 +73,7 @@ template("system_image_stub_apk") { 2581 } 2582 2583 action_with_pydeps(_resource_apk_target_name) { 2584 - script = "//build/android/gyp/compile_resources.py" 2585 + script = "//chromium/build/android/gyp/compile_resources.py" 2586 inputs = [ 2587 _manifest_path, 2588 android_sdk_tools_bundle_aapt2, 2589 @@ -234,7 +234,7 @@ template("system_image_apks") { 2590 } 2591 2592 action_with_pydeps(target_name) { 2593 - script = "//build/android/gyp/system_image_apks.py" 2594 + script = "//chromium/build/android/gyp/system_image_apks.py" 2595 deps = [ invoker.apk_or_bundle_target ] 2596 inputs = [ invoker.input_apk_or_bundle ] 2597 if (defined(invoker.stub_output)) { 2598 @@ -259,7 +259,7 @@ template("system_image_apks") { 2599 rebase_path(_wrapper_path, root_out_dir), 2600 ] 2601 inputs += [ _wrapper_path ] 2602 - deps += [ "//build/android:apk_operations_py" ] 2603 + deps += [ "//chromium/build/android:apk_operations_py" ] 2604 if (defined(invoker.fuse_apk) && invoker.fuse_apk) { 2605 args += [ "--fuse-apk" ] 2606 } 2607 diff --git a/config/android/test/proto/BUILD.gn b/config/android/test/proto/BUILD.gn 2608 index 9013c27ec..a959ef84d 100644 2609 --- a/config/android/test/proto/BUILD.gn 2610 +++ b/config/android/test/proto/BUILD.gn 2611 @@ -2,7 +2,7 @@ 2612 # Use of this source code is governed by a BSD-style license that can be 2613 # found in the LICENSE file. 2614 2615 -import("//build/config/android/rules.gni") 2616 +import("//chromium/build/config/android/rules.gni") 2617 import("//third_party/protobuf/proto_library.gni") 2618 2619 # The purpose of these targets is test that |deps| satisfies java compilation 2620 diff --git a/config/android/test/resource_overlay/BUILD.gn b/config/android/test/resource_overlay/BUILD.gn 2621 index 3b7936384..183252036 100644 2622 --- a/config/android/test/resource_overlay/BUILD.gn 2623 +++ b/config/android/test/resource_overlay/BUILD.gn 2624 @@ -2,7 +2,7 @@ 2625 # Use of this source code is governed by a BSD-style license that can be 2626 # found in the LICENSE file. 2627 2628 -import("//build/config/android/rules.gni") 2629 +import("//chromium/build/config/android/rules.gni") 2630 2631 # Tests for 'resource_overlay' parameter in android_resources() template. 2632 2633 diff --git a/config/apple/BUILD.gn b/config/apple/BUILD.gn 2634 index add2395d6..e604d26d1 100644 2635 --- a/config/apple/BUILD.gn 2636 +++ b/config/apple/BUILD.gn 2637 @@ -2,7 +2,7 @@ 2638 # Use of this source code is governed by a BSD-style license that can be 2639 # found in the LICENSE file. 2640 2641 -import("//build/config/apple/symbols.gni") 2642 +import("//chromium/build/config/apple/symbols.gni") 2643 2644 # The ldflags referenced below are handled by 2645 # //build/toolchain/apple/linker_driver.py. 2646 diff --git a/config/apple/create_signed_bundle.gni b/config/apple/create_signed_bundle.gni 2647 index 989ab96bd..2586fe2d7 100644 2648 --- a/config/apple/create_signed_bundle.gni 2649 +++ b/config/apple/create_signed_bundle.gni 2650 @@ -2,8 +2,8 @@ 2651 # Use of this source code is governed by a BSD-style license that can be 2652 # found in the LICENSE file. 2653 2654 -import("//build/config/apple/mobile_config.gni") 2655 -import("//build/toolchain/rbe.gni") 2656 +import("//chromium/build/config/apple/mobile_config.gni") 2657 +import("//chromium/build/toolchain/rbe.gni") 2658 import("//build_overrides/build.gni") 2659 2660 # Constants corresponding to the bundle type identifiers use application, 2661 @@ -177,7 +177,7 @@ template("apple_mobile_create_signed_bundle") { 2662 2663 if (_enable_entitlements) { 2664 if (!defined(invoker.entitlements_target)) { 2665 - _entitlements_path = "//build/config/ios/entitlements.plist" 2666 + _entitlements_path = "//chromium/build/config/ios/entitlements.plist" 2667 if (defined(invoker.entitlements_path)) { 2668 _entitlements_path = invoker.entitlements_path 2669 } 2670 @@ -270,7 +270,7 @@ template("apple_mobile_create_signed_bundle") { 2671 deps = [] 2672 } 2673 2674 - post_processing_script = "//build/config/apple/codesign.py" 2675 + post_processing_script = "//chromium/build/config/apple/codesign.py" 2676 post_processing_sources = [ _bundle_binary_path ] 2677 if (_enable_entitlements) { 2678 if (defined(invoker.entitlements_target)) { 2679 @@ -355,7 +355,7 @@ template("apple_mobile_create_signed_bundle") { 2680 invoker.partial_info_plist, 2681 ] 2682 2683 - _plist_compiler_path = "//build/apple/plist_util.py" 2684 + _plist_compiler_path = "//chromium/build/apple/plist_util.py" 2685 2686 post_processing_sources += _partial_info_plists 2687 post_processing_sources += [ _plist_compiler_path ] 2688 diff --git a/config/apple/mobile_bundle_data.gni b/config/apple/mobile_bundle_data.gni 2689 index 26be4a5a6..ad934d561 100644 2690 --- a/config/apple/mobile_bundle_data.gni 2691 +++ b/config/apple/mobile_bundle_data.gni 2692 @@ -2,10 +2,10 @@ 2693 # Use of this source code is governed by a BSD-style license that can be 2694 # found in the LICENSE file. 2695 2696 -import("//build/config/zip.gni") 2697 +import("//chromium/build/config/zip.gni") 2698 2699 if (is_ios) { 2700 - import("//build/config/ios/ios_sdk_overrides.gni") 2701 + import("//chromium/build/config/ios/ios_sdk_overrides.gni") 2702 } 2703 2704 # Compile a xib or storyboard file and add it to a bundle_data so that it is 2705 @@ -56,7 +56,7 @@ template("bundle_data_ib_file") { 2706 "bundle_files", 2707 ]) 2708 2709 - script = "//build/config/apple/compile_ib_files.py" 2710 + script = "//chromium/build/config/apple/compile_ib_files.py" 2711 args = [ 2712 "--input", 2713 rebase_path(invoker.source, root_build_dir), 2714 diff --git a/config/apple/mobile_config.gni b/config/apple/mobile_config.gni 2715 index 48e80f216..01a4e654c 100644 2716 --- a/config/apple/mobile_config.gni 2717 +++ b/config/apple/mobile_config.gni 2718 @@ -2,7 +2,7 @@ 2719 # Use of this source code is governed by a BSD-style license that can be 2720 # found in the LICENSE file. 2721 2722 -import("//build/config/features.gni") # For `use_blink` 2723 +import("//chromium/build/config/features.gni") # For `use_blink` 2724 2725 declare_args() { 2726 # Configure the environment for which to build. Could be either "device", 2727 @@ -118,7 +118,7 @@ if (is_ios || is_watchos) { 2728 ] 2729 } 2730 ios_code_signing_identity = 2731 - exec_script("//build/config/apple/find_signing_identity.py", 2732 + exec_script("//chromium/build/config/apple/find_signing_identity.py", 2733 find_signing_identity_args, 2734 "trim string") 2735 } 2736 diff --git a/config/apple/swift_source_set.gni b/config/apple/swift_source_set.gni 2737 index b1cad2e02..a3d0af3e1 100644 2738 --- a/config/apple/swift_source_set.gni 2739 +++ b/config/apple/swift_source_set.gni 2740 @@ -2,7 +2,7 @@ 2741 # Use of this source code is governed by a BSD-style license that can be 2742 # found in the LICENSE file. 2743 2744 -import("//build/toolchain/apple/toolchain.gni") 2745 +import("//chromium/build/toolchain/apple/toolchain.gni") 2746 2747 # Defines a template for Swift source files. The default module_name 2748 # of the target is the entire target label (without the leading //) 2749 diff --git a/config/apple/symbols.gni b/config/apple/symbols.gni 2750 index 3b4dee447..fc49783d1 100644 2751 --- a/config/apple/symbols.gni 2752 +++ b/config/apple/symbols.gni 2753 @@ -2,8 +2,8 @@ 2754 # Use of this source code is governed by a BSD-style license that can be 2755 # found in the LICENSE file. 2756 2757 -import("//build/config/chrome_build.gni") 2758 -import("//build/config/sanitizers/sanitizers.gni") 2759 +import("//chromium/build/config/chrome_build.gni") 2760 +import("//chromium/build/config/sanitizers/sanitizers.gni") 2761 2762 # This file declares arguments and configs that control whether dSYM debug 2763 # info is produced and whether build products are stripped. 2764 diff --git a/config/arm.gni b/config/arm.gni 2765 index f72ed80f5..25e64d430 100644 2766 --- a/config/arm.gni 2767 +++ b/config/arm.gni 2768 @@ -2,8 +2,8 @@ 2769 # Use of this source code is governed by a BSD-style license that can be 2770 # found in the LICENSE file. 2771 2772 -import("//build/config/chromeos/ui_mode.gni") 2773 -import("//build/config/v8_target_cpu.gni") 2774 +import("//chromium/build/config/chromeos/ui_mode.gni") 2775 +import("//chromium/build/config/v8_target_cpu.gni") 2776 2777 # These are primarily relevant in current_cpu == "arm" contexts, where 2778 # ARM code is being compiled. But they can also be relevant in the 2779 diff --git a/config/buildflags_paint_preview.gni b/config/buildflags_paint_preview.gni 2780 index f5eabf49a..1582abe38 100644 2781 --- a/config/buildflags_paint_preview.gni 2782 +++ b/config/buildflags_paint_preview.gni 2783 @@ -2,8 +2,8 @@ 2784 # Use of this source code is governed by a BSD-style license that can be 2785 # found in the LICENSE file. 2786 2787 -import("//build/config/cast.gni") 2788 -import("//build/config/features.gni") 2789 +import("//chromium/build/config/cast.gni") 2790 +import("//chromium/build/config/features.gni") 2791 2792 declare_args() { 2793 # Enable basic paint preview support. Does not work on iOS. Should 2794 diff --git a/config/c++/BUILD.gn b/config/c++/BUILD.gn 2795 index f449ebffc..fcf6675a7 100644 2796 --- a/config/c++/BUILD.gn 2797 +++ b/config/c++/BUILD.gn 2798 @@ -1,8 +1,8 @@ 2799 -import("//build/config/c++/c++.gni") 2800 -import("//build/config/chrome_build.gni") 2801 -import("//build/config/chromeos/ui_mode.gni") 2802 -import("//build/config/compiler/compiler.gni") 2803 -import("//build/config/dcheck_always_on.gni") 2804 +import("//chromium/build/config/c++/c++.gni") 2805 +import("//chromium/build/config/chrome_build.gni") 2806 +import("//chromium/build/config/chromeos/ui_mode.gni") 2807 +import("//chromium/build/config/compiler/compiler.gni") 2808 +import("//chromium/build/config/dcheck_always_on.gni") 2809 import("//buildtools/deps_revisions.gni") 2810 2811 assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set") 2812 diff --git a/config/c++/c++.gni b/config/c++/c++.gni 2813 index 7d29a7f65..fe8fd3206 100644 2814 --- a/config/c++/c++.gni 2815 +++ b/config/c++/c++.gni 2816 @@ -2,9 +2,9 @@ 2817 # Use of this source code is governed by a BSD-style license that can be 2818 # found in the LICENSE file. 2819 2820 -import("//build/config/nacl/config.gni") 2821 -import("//build/config/sanitizers/sanitizers.gni") 2822 -import("//build/toolchain/rbe.gni") 2823 +import("//chromium/build/config/nacl/config.gni") 2824 +import("//chromium/build/config/sanitizers/sanitizers.gni") 2825 +import("//chromium/build/toolchain/rbe.gni") 2826 import("//build_overrides/build.gni") 2827 2828 declare_args() { 2829 diff --git a/config/chromebox_for_meetings/BUILD.gn b/config/chromebox_for_meetings/BUILD.gn 2830 index 08d74f97d..db5dd3b6f 100644 2831 --- a/config/chromebox_for_meetings/BUILD.gn 2832 +++ b/config/chromebox_for_meetings/BUILD.gn 2833 @@ -2,8 +2,8 @@ 2834 # Use of this source code is governed by a BSD-style license that can be 2835 # found in the LICENSE file. 2836 2837 -import("//build/buildflag_header.gni") 2838 -import("//build/config/chromebox_for_meetings/buildflags.gni") 2839 +import("//chromium/build/buildflag_header.gni") 2840 +import("//chromium/build/config/chromebox_for_meetings/buildflags.gni") 2841 2842 buildflag_header("buildflags") { 2843 header = "buildflags.h" 2844 diff --git a/config/chromecast/BUILD.gn b/config/chromecast/BUILD.gn 2845 index 97bbef720..a7e085e46 100644 2846 --- a/config/chromecast/BUILD.gn 2847 +++ b/config/chromecast/BUILD.gn 2848 @@ -2,7 +2,7 @@ 2849 # Use of this source code is governed by a BSD-style license that can be 2850 # found in the LICENSE file. 2851 2852 -import("//build/config/cast.gni") 2853 +import("//chromium/build/config/cast.gni") 2854 2855 assert(is_castos || is_cast_android) 2856 2857 diff --git a/config/chromeos/BUILD.gn b/config/chromeos/BUILD.gn 2858 index 84be2dcca..f850557db 100644 2859 --- a/config/chromeos/BUILD.gn 2860 +++ b/config/chromeos/BUILD.gn 2861 @@ -2,7 +2,7 @@ 2862 # Use of this source code is governed by a BSD-style license that can be 2863 # found in the LICENSE file. 2864 2865 -import("//build/config/chromeos/ui_mode.gni") 2866 +import("//chromium/build/config/chromeos/ui_mode.gni") 2867 2868 assert(is_chromeos) 2869 2870 diff --git a/config/chromeos/rules.gni b/config/chromeos/rules.gni 2871 index 57e6a4139..331117e33 100644 2872 --- a/config/chromeos/rules.gni 2873 +++ b/config/chromeos/rules.gni 2874 @@ -2,12 +2,12 @@ 2875 # Use of this source code is governed by a BSD-style license that can be 2876 # found in the LICENSE file. 2877 2878 -import("//build/config/chrome_build.gni") 2879 -import("//build/config/chromeos/args.gni") 2880 -import("//build/config/dcheck_always_on.gni") 2881 -import("//build/config/gclient_args.gni") 2882 -import("//build/config/python.gni") 2883 -import("//build/util/generate_wrapper.gni") 2884 +import("//chromium/build/config/chrome_build.gni") 2885 +import("//chromium/build/config/chromeos/args.gni") 2886 +import("//chromium/build/config/dcheck_always_on.gni") 2887 +import("//chromium/build/config/gclient_args.gni") 2888 +import("//chromium/build/config/python.gni") 2889 +import("//chromium/build/util/generate_wrapper.gni") 2890 2891 assert(is_chromeos) 2892 assert(is_chromeos_device) 2893 @@ -35,7 +35,7 @@ if (cros_sdk_version != "") { 2894 2895 foreach(b, _potential_test_boards) { 2896 _cache_path_prefix = 2897 - "//build/cros_cache/chrome-sdk/symlinks/${b}+${cros_sdk_version}" 2898 + "//chromium/build/cros_cache/chrome-sdk/symlinks/${b}+${cros_sdk_version}" 2899 2900 _cros_is_vm = false 2901 foreach(b1, string_split(cros_boards_with_qemu_images, ":")) { 2902 @@ -70,7 +70,7 @@ if (cros_sdk_version != "") { 2903 _all_symlinks += m[1] 2904 } 2905 _all_symlink_targets = 2906 - exec_script("//build/get_symlink_targets.py", _all_symlinks, "list lines") 2907 + exec_script("//chromium/build/get_symlink_targets.py", _all_symlinks, "list lines") 2908 _index = 0 2909 foreach(m, _symlink_map) { 2910 _symlink_targets = [] 2911 @@ -143,9 +143,9 @@ template("generate_chromeos_sdk_deps") { 2912 data = _sdk_data 2913 data += [ 2914 # Needed for various SDK components used below. 2915 - "//build/cros_cache/chrome-sdk/misc/", 2916 - "//build/cros_cache/chrome-sdk/symlinks/", 2917 - "//build/cros_cache/common/", 2918 + "//chromium/build/cros_cache/chrome-sdk/misc/", 2919 + "//chromium/build/cros_cache/chrome-sdk/symlinks/", 2920 + "//chromium/build/cros_cache/common/", 2921 "//chrome/VERSION", 2922 2923 # The LKGM file controls what version of the VM image to download. Add it 2924 @@ -153,7 +153,7 @@ template("generate_chromeos_sdk_deps") { 2925 "//chromeos/CHROMEOS_LKGM", 2926 ] 2927 if (cros_boards_with_qemu_images != "") { 2928 - data += [ "//build/cros_cache/cipd/" ] 2929 + data += [ "//chromium/build/cros_cache/cipd/" ] 2930 } 2931 } 2932 } 2933 @@ -221,7 +221,7 @@ template("generate_skylab_tast_filter") { 2934 } 2935 action(target_name) { 2936 testonly = true 2937 - script = "//build/chromeos/generate_skylab_tast_filter.py" 2938 + script = "//chromium/build/chromeos/generate_skylab_tast_filter.py" 2939 if (defined(tast_control)) { 2940 sources = [ tast_control ] 2941 } 2942 @@ -322,7 +322,7 @@ template("generate_runner_script") { 2943 } 2944 2945 generate_wrapper(target_name) { 2946 - executable = "//build/chromeos/test_runner.py" 2947 + executable = "//chromium/build/chromeos/test_runner.py" 2948 wrapper_script = generated_script 2949 executable_args = [] 2950 2951 @@ -452,11 +452,11 @@ template("generate_runner_script") { 2952 2953 # We use android test-runner's results libs to construct gtest output 2954 # json. 2955 - "//build/android/pylib/__init__.py", 2956 - "//build/android/pylib/base/", 2957 - "//build/android/pylib/results/", 2958 - "//build/chromeos/", 2959 - "//build/util/", 2960 + "//chromium/build/android/pylib/__init__.py", 2961 + "//chromium/build/android/pylib/base/", 2962 + "//chromium/build/android/pylib/results/", 2963 + "//chromium/build/chromeos/", 2964 + "//chromium/build/util/", 2965 "//third_party/chromite/", 2966 ] 2967 2968 diff --git a/config/chromeos/ui_mode.gni b/config/chromeos/ui_mode.gni 2969 index 5dbe524b3..da47f3848 100644 2970 --- a/config/chromeos/ui_mode.gni 2971 +++ b/config/chromeos/ui_mode.gni 2972 @@ -2,7 +2,7 @@ 2973 # Use of this source code is governed by a BSD-style license that can be 2974 # found in the LICENSE file. 2975 2976 -import("//build/config/chromeos/args.gni") 2977 +import("//chromium/build/config/chromeos/args.gni") 2978 2979 declare_args() { 2980 chromeos_is_browser_only = false 2981 diff --git a/config/clang/BUILD.gn b/config/clang/BUILD.gn 2982 index beb81db98..166c55798 100644 2983 --- a/config/clang/BUILD.gn 2984 +++ b/config/clang/BUILD.gn 2985 @@ -2,20 +2,20 @@ 2986 # Use of this source code is governed by a BSD-style license that can be 2987 # found in the LICENSE file. 2988 2989 -import("//build/config/pch.gni") 2990 -import("//build/config/rust.gni") 2991 +import("//chromium/build/config/pch.gni") 2992 +import("//chromium/build/config/rust.gni") 2993 import("clang.gni") 2994 2995 if (is_ios) { 2996 # For `target_environment` and `target_platform`. 2997 - import("//build/config/apple/mobile_config.gni") 2998 + import("//chromium/build/config/apple/mobile_config.gni") 2999 } 3000 3001 _use_cros_sysroot_libs = 3002 is_chromeos_device && current_toolchain == default_toolchain 3003 3004 if (_use_cros_sysroot_libs) { 3005 - import("//build/toolchain/cros_toolchain.gni") # For `cros_target_cc` 3006 + import("//chromium/build/toolchain/cros_toolchain.gni") # For `cros_target_cc` 3007 } 3008 3009 # Helper function for adding cflags to use a clang plugin. 3010 diff --git a/config/clang/clang.gni b/config/clang/clang.gni 3011 index 2ad331d38..32574dd16 100644 3012 --- a/config/clang/clang.gni 3013 +++ b/config/clang/clang.gni 3014 @@ -2,10 +2,10 @@ 3015 # Use of this source code is governed by a BSD-style license that can be 3016 # found in the LICENSE file. 3017 3018 -import("//build/config/c++/c++.gni") 3019 -import("//build/toolchain/rbe.gni") 3020 -import("//build/toolchain/siso.gni") 3021 -import("//build/toolchain/toolchain.gni") 3022 +import("//chromium/build/config/c++/c++.gni") 3023 +import("//chromium/build/toolchain/rbe.gni") 3024 +import("//chromium/build/toolchain/siso.gni") 3025 +import("//chromium/build/toolchain/toolchain.gni") 3026 3027 default_clang_base_path = "//third_party/llvm-build/Release+Asserts" 3028 3029 @@ -15,7 +15,7 @@ declare_args() { 3030 # Chrome OS's. 3031 clang_use_chrome_plugins = 3032 is_clang && !is_nacl && current_os != "zos" && 3033 - default_toolchain != "//build/toolchain/cros:target" && 3034 + default_toolchain != "//chromium/build/toolchain/cros:target" && 3035 # TODO(https://crbug.com/351909443): Remove this after fixing performance 3036 # of Clang modules build. 3037 !use_libcxx_modules 3038 diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn 3039 index 1f2ccfa21..7111affd1 100644 3040 --- a/config/compiler/BUILD.gn 3041 +++ b/config/compiler/BUILD.gn 3042 @@ -2,44 +2,44 @@ 3043 # Use of this source code is governed by a BSD-style license that can be 3044 # found in the LICENSE file. 3045 3046 -import("//build/buildflag_header.gni") 3047 -import("//build/config/android/config.gni") 3048 -import("//build/config/c++/c++.gni") 3049 -import("//build/config/chrome_build.gni") 3050 -import("//build/config/chromeos/args.gni") 3051 -import("//build/config/clang/clang.gni") 3052 -import("//build/config/compiler/compiler.gni") 3053 -import("//build/config/coverage/coverage.gni") 3054 -import("//build/config/dcheck_always_on.gni") 3055 -#import("//build/config/gclient_args.gni") 3056 -import("//build/config/host_byteorder.gni") 3057 -import("//build/config/pch.gni") 3058 -import("//build/config/rust.gni") 3059 -import("//build/config/ui.gni") 3060 -import("//build/config/unwind.gni") 3061 -import("//build/toolchain/cros/cros_config.gni") 3062 -import("//build/toolchain/rbe.gni") 3063 -import("//build/toolchain/toolchain.gni") 3064 +import("//chromium/build/buildflag_header.gni") 3065 +import("//chromium/build/config/android/config.gni") 3066 +import("//chromium/build/config/c++/c++.gni") 3067 +import("//chromium/build/config/chrome_build.gni") 3068 +import("//chromium/build/config/chromeos/args.gni") 3069 +import("//chromium/build/config/clang/clang.gni") 3070 +import("//chromium/build/config/compiler/compiler.gni") 3071 +import("//chromium/build/config/coverage/coverage.gni") 3072 +import("//chromium/build/config/dcheck_always_on.gni") 3073 +#import("//chromium/build/config/gclient_args.gni") 3074 +import("//chromium/build/config/host_byteorder.gni") 3075 +import("//chromium/build/config/pch.gni") 3076 +import("//chromium/build/config/rust.gni") 3077 +import("//chromium/build/config/ui.gni") 3078 +import("//chromium/build/config/unwind.gni") 3079 +import("//chromium/build/toolchain/cros/cros_config.gni") 3080 +import("//chromium/build/toolchain/rbe.gni") 3081 +import("//chromium/build/toolchain/toolchain.gni") 3082 import("//build_overrides/build.gni") 3083 3084 if (current_cpu == "arm" || current_cpu == "arm64") { 3085 - import("//build/config/arm.gni") 3086 + import("//chromium/build/config/arm.gni") 3087 } 3088 if (current_cpu == "mipsel" || current_cpu == "mips64el" || 3089 current_cpu == "mips" || current_cpu == "mips64") { 3090 - import("//build/config/mips.gni") 3091 + import("//chromium/build/config/mips.gni") 3092 } 3093 if (is_mac) { 3094 - import("//build/config/apple/symbols.gni") 3095 + import("//chromium/build/config/apple/symbols.gni") 3096 } 3097 if (is_ios) { 3098 - import("//build/config/ios/ios_sdk.gni") 3099 + import("//chromium/build/config/ios/ios_sdk.gni") 3100 } 3101 if (is_nacl) { 3102 # To keep NaCl variables out of builds that don't include NaCl, all 3103 # variables defined in nacl/config.gni referenced here should be protected by 3104 # is_nacl conditions. 3105 - import("//build/config/nacl/config.gni") 3106 + import("//chromium/build/config/nacl/config.gni") 3107 } 3108 3109 lld_path = "" 3110 @@ -286,23 +286,23 @@ config("compiler") { 3111 # categories here, add it to the associated file to keep this shared config 3112 # smaller. 3113 if (is_win) { 3114 - configs += [ "//build/config/win:compiler" ] 3115 + configs += [ "//chromium/build/config/win:compiler" ] 3116 } else if (is_android) { 3117 - configs += [ "//build/config/android:compiler" ] 3118 + configs += [ "//chromium/build/config/android:compiler" ] 3119 } else if (is_linux || is_chromeos) { 3120 - configs += [ "//build/config/linux:compiler" ] 3121 + configs += [ "//chromium/build/config/linux:compiler" ] 3122 } else if (is_nacl) { 3123 - configs += [ "//build/config/nacl:compiler" ] 3124 + configs += [ "//chromium/build/config/nacl:compiler" ] 3125 } else if (is_mac) { 3126 - configs += [ "//build/config/mac:compiler" ] 3127 + configs += [ "//chromium/build/config/mac:compiler" ] 3128 } else if (is_ios) { 3129 - configs += [ "//build/config/ios:compiler" ] 3130 + configs += [ "//chromium/build/config/ios:compiler" ] 3131 } else if (is_fuchsia) { 3132 - configs += [ "//build/config/fuchsia:compiler" ] 3133 + configs += [ "//chromium/build/config/fuchsia:compiler" ] 3134 } else if (current_os == "aix") { 3135 - configs += [ "//build/config/aix:compiler" ] 3136 + configs += [ "//chromium/build/config/aix:compiler" ] 3137 } else if (current_os == "zos") { 3138 - configs += [ "//build/config/zos:compiler" ] 3139 + configs += [ "//chromium/build/config/zos:compiler" ] 3140 } 3141 3142 configs += [ 3143 @@ -593,7 +593,7 @@ config("compiler") { 3144 # TODO(crbug.com/40283598): This causes binary size growth and potentially 3145 # other problems. 3146 # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version. 3147 - if (default_toolchain != "//build/toolchain/cros:target" && 3148 + if (default_toolchain != "//chromium/build/toolchain/cros:target" && 3149 !llvm_android_mainline) { 3150 cflags += [ 3151 "-mllvm", 3152 @@ -618,7 +618,7 @@ config("compiler") { 3153 # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF 3154 # (excluding toolchains that use an older version of LLVM). 3155 if (is_linux && !llvm_android_mainline && 3156 - default_toolchain != "//build/toolchain/cros:target") { 3157 + default_toolchain != "//chromium/build/toolchain/cros:target") { 3158 cflags += [ "-Wa,--crel,--allow-experimental-crel" ] 3159 } 3160 } 3161 @@ -1147,8 +1147,8 @@ config("thinlto_optimize_default") { 3162 # Use this to enable optimization in the ThinLTO link step for select targets 3163 # when thin_lto_enable_optimizations is set by doing: 3164 # 3165 -# configs -= [ "//build/config/compiler:thinlto_optimize_default" ] 3166 -# configs += [ "//build/config/compiler:thinlto_optimize_max" ] 3167 +# configs -= [ "//chromium/build/config/compiler:thinlto_optimize_default" ] 3168 +# configs += [ "//chromium/build/config/compiler:thinlto_optimize_max" ] 3169 # 3170 # Since it makes linking significantly slower and more resource intensive, only 3171 # use it on important targets such as the main browser executable or dll. 3172 @@ -1190,7 +1190,7 @@ config("compiler_cpu_abi") { 3173 3174 configs = [] 3175 if (is_chromeos) { 3176 - configs += [ "//build/config/chromeos:compiler_cpu_abi" ] 3177 + configs += [ "//chromium/build/config/chromeos:compiler_cpu_abi" ] 3178 } 3179 3180 if ((is_posix && !is_apple) || is_fuchsia) { 3181 @@ -1504,7 +1504,7 @@ config("compiler_codegen") { 3182 ldflags = [] 3183 3184 if (is_nacl) { 3185 - configs += [ "//build/config/nacl:compiler_codegen" ] 3186 + configs += [ "//chromium/build/config/nacl:compiler_codegen" ] 3187 } 3188 3189 if (current_cpu == "arm64" && !is_win && is_clang) { 3190 @@ -1652,7 +1652,7 @@ config("clang_revision") { 3191 # e.g. by setting in the the project's .gn file. 3192 config("clang_warning_suppression") { 3193 # Some build configs use older versions of clang that don't support WSMs 3194 - if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" && 3195 + if (!is_nacl && default_toolchain != "//chromium/build/toolchain/cros:target" && 3196 !llvm_android_mainline && is_clang && 3197 clang_warning_suppression_file != "") { 3198 from_build_root = 3199 @@ -1765,7 +1765,7 @@ config("runtime_library") { 3200 # libandroid_support in the -isystem include order. Otherwise, there will be 3201 # build errors related to symbols declared in math.h. 3202 if (use_custom_libcxx) { 3203 - configs += [ "//build/config/c++:runtime_library" ] 3204 + configs += [ "//chromium/build/config/c++:runtime_library" ] 3205 } 3206 3207 # Rust and C++ both provide intrinsics for LLVM to call for math operations. We 3208 @@ -1775,13 +1775,13 @@ config("runtime_library") { 3209 # order to cause that replacement to occur by explicitly linking in clang's 3210 # compiler-rt library. 3211 if (is_clang && !is_nacl && !is_cronet_build) { 3212 - configs += [ "//build/config/clang:compiler_builtins" ] 3213 + configs += [ "//chromium/build/config/clang:compiler_builtins" ] 3214 } 3215 3216 # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia 3217 # configuration. 3218 if (is_posix || is_fuchsia) { 3219 - configs += [ "//build/config/posix:runtime_library" ] 3220 + configs += [ "//chromium/build/config/posix:runtime_library" ] 3221 3222 if (use_custom_libunwind) { 3223 # Instead of using an unwind lib from the toolchain, 3224 @@ -1794,18 +1794,18 @@ config("runtime_library") { 3225 # categories here, add it to the associated file to keep this shared config 3226 # smaller. 3227 if (is_win) { 3228 - configs += [ "//build/config/win:runtime_library" ] 3229 + configs += [ "//chromium/build/config/win:runtime_library" ] 3230 } else if (is_linux || is_chromeos) { 3231 - configs += [ "//build/config/linux:runtime_library" ] 3232 + configs += [ "//chromium/build/config/linux:runtime_library" ] 3233 if (is_chromeos) { 3234 - configs += [ "//build/config/chromeos:runtime_library" ] 3235 + configs += [ "//chromium/build/config/chromeos:runtime_library" ] 3236 } 3237 } else if (is_ios) { 3238 - configs += [ "//build/config/ios:runtime_library" ] 3239 + configs += [ "//chromium/build/config/ios:runtime_library" ] 3240 } else if (is_mac) { 3241 - configs += [ "//build/config/mac:runtime_library" ] 3242 + configs += [ "//chromium/build/config/mac:runtime_library" ] 3243 } else if (is_android) { 3244 - configs += [ "//build/config/android:runtime_library" ] 3245 + configs += [ "//chromium/build/config/android:runtime_library" ] 3246 } 3247 3248 if (is_component_build) { 3249 @@ -2082,7 +2082,7 @@ config("default_warnings") { 3250 # See also: https://docs.google.com/document/d/1CTbQ-5cQjnjU8aCOtLiA7G6P0i5C6HpSDNlSNq6nl5E 3251 # 3252 # To enable in a GN target, use: 3253 -# configs += [ "//build/config/compiler:prevent_unsafe_narrowing" ] 3254 +# configs += [ "//chromium/build/config/compiler:prevent_unsafe_narrowing" ] 3255 3256 config("prevent_unsafe_narrowing") { 3257 if (is_clang) { 3258 @@ -2428,8 +2428,8 @@ config("no_incompatible_pointer_warnings") { 3259 # You can override the optimization level on a per-target basis by removing the 3260 # default config and then adding the named one you want: 3261 # 3262 -# configs -= [ "//build/config/compiler:default_optimization" ] 3263 -# configs += [ "//build/config/compiler:optimize_max" ] 3264 +# configs -= [ "//chromium/build/config/compiler:default_optimization" ] 3265 +# configs += [ "//chromium/build/config/compiler:optimize_max" ] 3266 3267 # Shared settings for both "optimize" and "optimize_max" configs. 3268 # IMPORTANT: On Windows "/O1" and "/O2" must go before the common flags. 3269 @@ -2655,12 +2655,12 @@ config("optimize_max") { 3270 # The NaCl IRT is a special case and always wants its own config. 3271 # Various components do: 3272 # if (!is_debug) { 3273 - # configs -= [ "//build/config/compiler:default_optimization" ] 3274 - # configs += [ "//build/config/compiler:optimize_max" ] 3275 + # configs -= [ "//chromium/build/config/compiler:default_optimization" ] 3276 + # configs += [ "//chromium/build/config/compiler:optimize_max" ] 3277 # } 3278 # So this config has to have the selection logic just like 3279 # "default_optimization", below. 3280 - configs = [ "//build/config/nacl:irt_optimize" ] 3281 + configs = [ "//chromium/build/config/nacl:irt_optimize" ] 3282 } else { 3283 ldflags = common_optimize_on_ldflags 3284 if (is_win) { 3285 @@ -2688,12 +2688,12 @@ config("optimize_speed") { 3286 # The NaCl IRT is a special case and always wants its own config. 3287 # Various components do: 3288 # if (!is_debug) { 3289 - # configs -= [ "//build/config/compiler:default_optimization" ] 3290 - # configs += [ "//build/config/compiler:optimize_max" ] 3291 + # configs -= [ "//chromium/build/config/compiler:default_optimization" ] 3292 + # configs += [ "//chromium/build/config/compiler:optimize_max" ] 3293 # } 3294 # So this config has to have the selection logic just like 3295 # "default_optimization", below. 3296 - configs = [ "//build/config/nacl:irt_optimize" ] 3297 + configs = [ "//chromium/build/config/nacl:irt_optimize" ] 3298 } else { 3299 ldflags = common_optimize_on_ldflags 3300 if (is_win) { 3301 @@ -2725,7 +2725,7 @@ config("default_optimization") { 3302 if (is_nacl && is_nacl_irt) { 3303 # The NaCl IRT is a special case and always wants its own config. 3304 # It gets optimized the same way regardless of the type of build. 3305 - configs = [ "//build/config/nacl:irt_optimize" ] 3306 + configs = [ "//chromium/build/config/nacl:irt_optimize" ] 3307 } else if (is_debug) { 3308 configs = [ ":no_optimize" ] 3309 } else if (optimize_for_fuzzing) { 3310 @@ -2819,8 +2819,8 @@ config("afdo") { 3311 # You can override the symbol level on a per-target basis by removing the 3312 # default config and then adding the named one you want: 3313 # 3314 -# configs -= [ "//build/config/compiler:default_symbols" ] 3315 -# configs += [ "//build/config/compiler:symbols" ] 3316 +# configs -= [ "//chromium/build/config/compiler:default_symbols" ] 3317 +# configs += [ "//chromium/build/config/compiler:symbols" ] 3318 3319 # A helper config that all configs passing /DEBUG to the linker should 3320 # include as sub-config. 3321 @@ -2966,7 +2966,7 @@ config("symbols") { 3322 # https://b/243982712, https://crbug.com/1354616, https://crbug.com/334073642 3323 if (symbol_level == 2 && !use_debug_fission && !is_nacl && !is_win && 3324 (current_cpu == "arm" || current_cpu == "x86")) { 3325 - configs += [ "//build/config:compress_debug_sections" ] 3326 + configs += [ "//chromium/build/config:compress_debug_sections" ] 3327 } 3328 3329 if (is_clang && !is_nacl && is_win && !is_component_build) { 3330 diff --git a/config/compiler/compiler.gni b/config/compiler/compiler.gni 3331 index 5b98b4aed..dd833211b 100644 3332 --- a/config/compiler/compiler.gni 3333 +++ b/config/compiler/compiler.gni 3334 @@ -2,27 +2,27 @@ 3335 # Use of this source code is governed by a BSD-style license that can be 3336 # found in the LICENSE file. 3337 3338 -import("//build/config/c++/c++.gni") 3339 -import("//build/config/cast.gni") 3340 -import("//build/config/chrome_build.gni") 3341 -import("//build/config/chromeos/args.gni") 3342 -import("//build/config/chromeos/ui_mode.gni") 3343 -import("//build/config/compiler/pgo/pgo.gni") 3344 -import("//build/config/cronet/config.gni") 3345 -import("//build/config/sanitizers/sanitizers.gni") 3346 -import("//build/toolchain/cc_wrapper.gni") 3347 -import("//build/toolchain/toolchain.gni") 3348 +import("//chromium/build/config/c++/c++.gni") 3349 +import("//chromium/build/config/cast.gni") 3350 +import("//chromium/build/config/chrome_build.gni") 3351 +import("//chromium/build/config/chromeos/args.gni") 3352 +import("//chromium/build/config/chromeos/ui_mode.gni") 3353 +import("//chromium/build/config/compiler/pgo/pgo.gni") 3354 +import("//chromium/build/config/cronet/config.gni") 3355 +import("//chromium/build/config/sanitizers/sanitizers.gni") 3356 +import("//chromium/build/toolchain/cc_wrapper.gni") 3357 +import("//chromium/build/toolchain/toolchain.gni") 3358 import("//build_overrides/build.gni") 3359 3360 if (is_android) { 3361 - import("//build/config/android/abi.gni") 3362 + import("//chromium/build/config/android/abi.gni") 3363 } 3364 if (current_cpu == "arm" || current_cpu == "arm64") { 3365 - import("//build/config/arm.gni") 3366 + import("//chromium/build/config/arm.gni") 3367 } 3368 3369 if (is_apple) { 3370 - import("//build/config/apple/symbols.gni") 3371 + import("//chromium/build/config/apple/symbols.gni") 3372 } 3373 3374 declare_args() { 3375 diff --git a/config/compiler/pgo/BUILD.gn b/config/compiler/pgo/BUILD.gn 3376 index b5b77030a..c0085398b 100644 3377 --- a/config/compiler/pgo/BUILD.gn 3378 +++ b/config/compiler/pgo/BUILD.gn 3379 @@ -2,11 +2,11 @@ 3380 # Use of this source code is governed by a BSD-style license that can be 3381 # found in the LICENSE file. 3382 3383 -import("//build/config/clang/clang.gni") 3384 -import("//build/config/compiler/compiler.gni") 3385 -import("//build/config/compiler/pgo/pgo.gni") 3386 -import("//build/config/features.gni") 3387 -import("//build/toolchain/toolchain.gni") 3388 +import("//chromium/build/config/clang/clang.gni") 3389 +import("//chromium/build/config/compiler/compiler.gni") 3390 +import("//chromium/build/config/compiler/pgo/pgo.gni") 3391 +import("//chromium/build/config/features.gni") 3392 +import("//chromium/build/toolchain/toolchain.gni") 3393 3394 # Configuration that enables PGO instrumentation. 3395 config("pgo_instrumentation_flags") { 3396 diff --git a/config/compiler/pgo/pgo.gni b/config/compiler/pgo/pgo.gni 3397 index 0f1d7d3c3..772d50d1d 100644 3398 --- a/config/compiler/pgo/pgo.gni 3399 +++ b/config/compiler/pgo/pgo.gni 3400 @@ -2,15 +2,15 @@ 3401 # Use of this source code is governed by a BSD-style license that can be 3402 # found in the LICENSE file. 3403 3404 -import("//build/config/cast.gni") 3405 -import("//build/config/chrome_build.gni") 3406 -import("//build/config/chromeos/ui_mode.gni") 3407 -import("//build/config/cronet/config.gni") 3408 -import("//build/config/dcheck_always_on.gni") 3409 -import("//build/config/features.gni") 3410 +import("//chromium/build/config/cast.gni") 3411 +import("//chromium/build/config/chrome_build.gni") 3412 +import("//chromium/build/config/chromeos/ui_mode.gni") 3413 +import("//chromium/build/config/cronet/config.gni") 3414 +import("//chromium/build/config/dcheck_always_on.gni") 3415 +import("//chromium/build/config/features.gni") 3416 3417 if (is_ios) { 3418 - import("//build/config/apple/mobile_config.gni") 3419 + import("//chromium/build/config/apple/mobile_config.gni") 3420 } 3421 3422 declare_args() { 3423 diff --git a/config/coverage/BUILD.gn b/config/coverage/BUILD.gn 3424 index 1f02cb476..a9dc135d6 100644 3425 --- a/config/coverage/BUILD.gn 3426 +++ b/config/coverage/BUILD.gn 3427 @@ -2,9 +2,9 @@ 3428 # Use of this source code is governed by a BSD-style license that can be 3429 # found in the LICENSE file. 3430 3431 -import("//build/buildflag_header.gni") 3432 -import("//build/config/coverage/coverage.gni") 3433 -import("//build/config/rust.gni") 3434 +import("//chromium/build/buildflag_header.gni") 3435 +import("//chromium/build/config/coverage/coverage.gni") 3436 +import("//chromium/build/config/rust.gni") 3437 3438 config("default_coverage") { 3439 if (use_clang_coverage) { 3440 @@ -22,7 +22,7 @@ config("default_coverage") { 3441 # instead), and thus the linker ends up not pulling in the profile 3442 # library. So we add an edge to it directly. 3443 if (toolchain_has_rust) { 3444 - configs += [ "//build/config/clang:compiler_profile" ] 3445 + configs += [ "//chromium/build/config/clang:compiler_profile" ] 3446 } 3447 } 3448 3449 diff --git a/config/coverage/coverage.gni b/config/coverage/coverage.gni 3450 index 803a036e3..776489e10 100644 3451 --- a/config/coverage/coverage.gni 3452 +++ b/config/coverage/coverage.gni 3453 @@ -2,7 +2,7 @@ 3454 # Use of this source code is governed by a BSD-style license that can be 3455 # found in the LICENSE file. 3456 3457 -import("//build/toolchain/toolchain.gni") 3458 +import("//chromium/build/toolchain/toolchain.gni") 3459 if (is_fuchsia) { 3460 import("//third_party/fuchsia-gn-sdk/src/component.gni") 3461 } 3462 diff --git a/config/cuttlefish/BUILD.gn b/config/cuttlefish/BUILD.gn 3463 index bbff7dc2c..0bfe6392a 100644 3464 --- a/config/cuttlefish/BUILD.gn 3465 +++ b/config/cuttlefish/BUILD.gn 3466 @@ -2,8 +2,8 @@ 3467 # Use of this source code is governed by a BSD-style license that can be 3468 # found in the LICENSE file. 3469 3470 -import("//build/buildflag_header.gni") 3471 -import("//build/config/cuttlefish/buildflags.gni") 3472 +import("//chromium/build/buildflag_header.gni") 3473 +import("//chromium/build/config/cuttlefish/buildflags.gni") 3474 3475 buildflag_header("buildflags") { 3476 header = "buildflags.h" 3477 diff --git a/config/dcheck_always_on.gni b/config/dcheck_always_on.gni 3478 index 0c1e2590e..4fc71bac3 100644 3479 --- a/config/dcheck_always_on.gni 3480 +++ b/config/dcheck_always_on.gni 3481 @@ -5,7 +5,7 @@ 3482 # TODO(crbug.com/40191347): Until the bug is resolved we need to include 3483 # gclient_args for the definition of build_with_chromium and build_overrides 3484 # for client overrides of that flag. The latter should go away. 3485 -import("//build/config/gclient_args.gni") 3486 +import("//chromium/build/config/gclient_args.gni") 3487 import("//build_overrides/build.gni") 3488 declare_args() { 3489 # Enables DCHECKs to be built-in, but to default to being non-fatal/log-only. 3490 diff --git a/config/devtools.gni b/config/devtools.gni 3491 index a1df14fd6..237346cdc 100644 3492 --- a/config/devtools.gni 3493 +++ b/config/devtools.gni 3494 @@ -2,7 +2,7 @@ 3495 # Use of this source code is governed by a BSD-style license that can be 3496 # found in the LICENSE file. 3497 3498 -import("//build/config/chrome_build.gni") 3499 +import("//chromium/build/config/chrome_build.gni") 3500 import("//build_overrides/build.gni") 3501 3502 declare_args() { 3503 diff --git a/config/features.gni b/config/features.gni 3504 index a142b455b..dcc1731cf 100644 3505 --- a/config/features.gni 3506 +++ b/config/features.gni 3507 @@ -14,8 +14,8 @@ 3508 # There is more advice on where to put build flags in the "Build flag" section 3509 # of //build/config/BUILDCONFIG.gn. 3510 3511 -import("//build/config/cast.gni") 3512 -import("//build/config/chrome_build.gni") 3513 +import("//chromium/build/config/cast.gni") 3514 +import("//chromium/build/config/chrome_build.gni") 3515 3516 declare_args() { 3517 # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4. 3518 diff --git a/config/freetype/BUILD.gn b/config/freetype/BUILD.gn 3519 index 88a9c59f0..52170c9ef 100644 3520 --- a/config/freetype/BUILD.gn 3521 +++ b/config/freetype/BUILD.gn 3522 @@ -2,12 +2,12 @@ 3523 # Use of this source code is governed by a BSD-style license that can be 3524 # found in the LICENSE file. 3525 3526 -import("//build/config/features.gni") 3527 -import("//build/config/freetype/freetype.gni") 3528 +import("//chromium/build/config/features.gni") 3529 +import("//chromium/build/config/freetype/freetype.gni") 3530 3531 group("freetype") { 3532 if (use_system_freetype) { 3533 - public_configs = [ "//build/linux:freetype_from_pkgconfig" ] 3534 + public_configs = [ "//chromium/build/linux:freetype_from_pkgconfig" ] 3535 } else { 3536 public_deps = [ "//third_party:freetype_harfbuzz" ] 3537 } 3538 diff --git a/config/fuchsia/BUILD.gn b/config/fuchsia/BUILD.gn 3539 index b6ef61df7..45fc5b9dc 100644 3540 --- a/config/fuchsia/BUILD.gn 3541 +++ b/config/fuchsia/BUILD.gn 3542 @@ -2,9 +2,9 @@ 3543 # Use of this source code is governed by a BSD-style license that can be 3544 # found in the LICENSE file. 3545 3546 -import("//build/config/clang/clang.gni") 3547 -import("//build/config/fuchsia/generate_runner_scripts.gni") 3548 -import("//build/config/fuchsia/gn_configs.gni") 3549 +import("//chromium/build/config/clang/clang.gni") 3550 +import("//chromium/build/config/fuchsia/generate_runner_scripts.gni") 3551 +import("//chromium/build/config/fuchsia/gn_configs.gni") 3552 3553 assert(is_fuchsia) 3554 assert(!is_posix, "Fuchsia is not POSIX.") 3555 @@ -26,8 +26,8 @@ config("compiler") { 3556 # Files required to run on Fuchsia on isolated swarming clients. 3557 group("deployment_resources") { 3558 data = [ 3559 - "//build/fuchsia/", 3560 - "//build/util/lib/", 3561 + "//chromium/build/fuchsia/", 3562 + "//chromium/build/util/lib/", 3563 "//third_party/fuchsia-sdk/sdk/.build-id/", 3564 "//third_party/fuchsia-sdk/sdk/meta/manifest.json", 3565 "//third_party/fuchsia-sdk/sdk/tools/${test_host_cpu}/", 3566 diff --git a/config/fuchsia/DIR_METADATA b/config/fuchsia/DIR_METADATA 3567 index 210aa6a95..ddd134a2b 100644 3568 --- a/config/fuchsia/DIR_METADATA 3569 +++ b/config/fuchsia/DIR_METADATA 3570 @@ -1 +1 @@ 3571 -mixins: "//build/fuchsia/COMMON_METADATA" 3572 +mixins: "//chromium/build/fuchsia/COMMON_METADATA" 3573 diff --git a/config/fuchsia/generate_runner_scripts.gni b/config/fuchsia/generate_runner_scripts.gni 3574 index 2c7b54ab3..c508d5e02 100644 3575 --- a/config/fuchsia/generate_runner_scripts.gni 3576 +++ b/config/fuchsia/generate_runner_scripts.gni 3577 @@ -2,11 +2,11 @@ 3578 # Use of this source code is governed by a BSD-style license that can be 3579 # found in the LICENSE file. 3580 3581 -import("//build/config/fuchsia/config.gni") 3582 -import("//build/config/fuchsia/fuchsia_package_metadata.gni") 3583 -import("//build/config/gclient_args.gni") 3584 -import("//build/config/sysroot.gni") 3585 -import("//build/util/generate_wrapper.gni") 3586 +import("//chromium/build/config/fuchsia/config.gni") 3587 +import("//chromium/build/config/fuchsia/fuchsia_package_metadata.gni") 3588 +import("//chromium/build/config/gclient_args.gni") 3589 +import("//chromium/build/config/sysroot.gni") 3590 +import("//chromium/build/util/generate_wrapper.gni") 3591 3592 assert(is_fuchsia) 3593 3594 @@ -90,7 +90,7 @@ template("fuchsia_run_script_with_packages") { 3595 if (!defined(data_deps)) { 3596 data_deps = [] 3597 } 3598 - data_deps += [ "//build/config/fuchsia:deployment_resources" ] 3599 + data_deps += [ "//chromium/build/config/fuchsia:deployment_resources" ] 3600 3601 _combined_package_list = [ invoker.package ] 3602 3603 @@ -169,7 +169,7 @@ template("fuchsia_package_installer") { 3604 "*", 3605 TESTONLY_AND_VISIBILITY + [ "executable_args" ]) 3606 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY) 3607 - executable = rebase_path("//build/fuchsia/test/deploy_to_fuchsia.py") 3608 + executable = rebase_path("//chromium/build/fuchsia/test/deploy_to_fuchsia.py") 3609 executable_args = [ 3610 "--out-dir", 3611 "@WrappedPath(.)", 3612 @@ -196,7 +196,7 @@ template("fuchsia_test_runner") { 3613 "package_deps", 3614 ]) 3615 3616 - _test_runner_py = "//build/fuchsia/test/run_test.py" 3617 + _test_runner_py = "//chromium/build/fuchsia/test/run_test.py" 3618 3619 executable = rebase_path(_test_runner_py) 3620 3621 diff --git a/config/fuchsia/packaged_content_embedder_excluded_dirs.gni b/config/fuchsia/packaged_content_embedder_excluded_dirs.gni 3622 index 16f8260b4..17afa49be 100644 3623 --- a/config/fuchsia/packaged_content_embedder_excluded_dirs.gni 3624 +++ b/config/fuchsia/packaged_content_embedder_excluded_dirs.gni 3625 @@ -2,7 +2,7 @@ 3626 # Use of this source code is governed by a BSD-style license that can be 3627 # found in the LICENSE file. 3628 3629 -import("//build/config/devtools.gni") 3630 +import("//chromium/build/config/devtools.gni") 3631 3632 assert(is_fuchsia) 3633 3634 diff --git a/config/fuchsia/size_optimized_cast_receiver_args.gn b/config/fuchsia/size_optimized_cast_receiver_args.gn 3635 index d259ded8d..1496ec3cf 100644 3636 --- a/config/fuchsia/size_optimized_cast_receiver_args.gn 3637 +++ b/config/fuchsia/size_optimized_cast_receiver_args.gn 3638 @@ -8,7 +8,7 @@ 3639 # 3640 # To use it do one of the following: 3641 # * Add the following to your `gn args`: 3642 -# import("//build/config/fuchsia/size_optimized_cast_receiver_args.gn") 3643 +# import("//chromium/build/config/fuchsia/size_optimized_cast_receiver_args.gn") 3644 # * Add the following to `gn_args` in a bot recipe: 3645 # 'args_file': '//build/config/fuchsia/size_optimized_cast_receiver_args.gn' 3646 3647 diff --git a/config/fuchsia/size_optimized_cast_receiver_args_internal.gn b/config/fuchsia/size_optimized_cast_receiver_args_internal.gn 3648 index a6d8c8202..020189183 100644 3649 --- a/config/fuchsia/size_optimized_cast_receiver_args_internal.gn 3650 +++ b/config/fuchsia/size_optimized_cast_receiver_args_internal.gn 3651 @@ -11,7 +11,7 @@ 3652 # * Add the following to `gn_args` in a bot recipe: 3653 # 'args_file': '//build/config/fuchsia/size_optimized_cast_receiver_args_internal.gn' 3654 3655 -import("//build/config/fuchsia/size_optimized_cast_receiver_args.gn") 3656 +import("//chromium/build/config/fuchsia/size_optimized_cast_receiver_args.gn") 3657 3658 enable_widevine = true 3659 use_internal_isolated_origins = true 3660 diff --git a/config/fuchsia/sizes.gni b/config/fuchsia/sizes.gni 3661 index bba225f29..69aacd934 100644 3662 --- a/config/fuchsia/sizes.gni 3663 +++ b/config/fuchsia/sizes.gni 3664 @@ -4,7 +4,7 @@ 3665 3666 assert(is_fuchsia) 3667 3668 -import("//build/util/generate_wrapper.gni") 3669 +import("//chromium/build/util/generate_wrapper.gni") 3670 3671 template("compute_fuchsia_package_sizes") { 3672 generate_wrapper(target_name) { 3673 @@ -14,7 +14,7 @@ template("compute_fuchsia_package_sizes") { 3674 "data_deps", 3675 ]) 3676 testonly = true 3677 - executable = "//build/fuchsia/binary_sizes.py" 3678 + executable = "//chromium/build/fuchsia/binary_sizes.py" 3679 wrapper_script = "$root_out_dir/bin/run_${target_name}" 3680 3681 assert(target_cpu == "arm64" || target_cpu == "x64", 3682 @@ -32,7 +32,7 @@ template("compute_fuchsia_package_sizes") { 3683 # swarming test client. Note, fuchsia-arm64 is also running binary-sizes, 3684 # so the arm64 tools are included. 3685 data += [ 3686 - "//build/fuchsia/", 3687 + "//chromium/build/fuchsia/", 3688 "//tools/fuchsia/size_tests/", 3689 "//third_party/fuchsia-sdk/sdk/tools/arm64/", 3690 "//third_party/fuchsia-sdk/sdk/tools/x64/", 3691 diff --git a/config/fuchsia/symbol_archive.gni b/config/fuchsia/symbol_archive.gni 3692 index e05af1155..09060e4ab 100644 3693 --- a/config/fuchsia/symbol_archive.gni 3694 +++ b/config/fuchsia/symbol_archive.gni 3695 @@ -19,7 +19,7 @@ template("symbol_archive") { 3696 _ids_txt = invoker.ids_txt 3697 _build_ids = invoker.archive_name 3698 3699 - script = "//build/config/fuchsia/build_symbol_archive.py" 3700 + script = "//chromium/build/config/fuchsia/build_symbol_archive.py" 3701 3702 inputs = [ _ids_txt ] 3703 3704 diff --git a/config/fuchsia/test/platform_video_codecs.shard.test-cml b/config/fuchsia/test/platform_video_codecs.shard.test-cml 3705 index bfa19c7d3..515c7c03b 100644 3706 --- a/config/fuchsia/test/platform_video_codecs.shard.test-cml 3707 +++ b/config/fuchsia/test/platform_video_codecs.shard.test-cml 3708 @@ -3,7 +3,7 @@ 3709 // found in the LICENSE file. 3710 { 3711 include: [ 3712 - "//build/config/fuchsia/test/sysmem.shard.test-cml", 3713 + "//chromium/build/config/fuchsia/test/sysmem.shard.test-cml", 3714 ], 3715 children: [ 3716 { 3717 diff --git a/config/fuchsia/test/test_ui_stack.shard.test-cml b/config/fuchsia/test/test_ui_stack.shard.test-cml 3718 index 4e0103eea..d9975bb0c 100644 3719 --- a/config/fuchsia/test/test_ui_stack.shard.test-cml 3720 +++ b/config/fuchsia/test/test_ui_stack.shard.test-cml 3721 @@ -2,7 +2,7 @@ 3722 // Use of this source code is governed by a BSD-style license that can be 3723 // found in the LICENSE file. 3724 { 3725 - include: [ "//build/config/fuchsia/test/sysmem.shard.test-cml" ], 3726 + include: [ "//chromium/build/config/fuchsia/test/sysmem.shard.test-cml" ], 3727 children: [ 3728 { 3729 name: "test_ui_stack", 3730 diff --git a/config/fuchsia/test/web_instance.shard.test-cml b/config/fuchsia/test/web_instance.shard.test-cml 3731 index b996f4ab6..793c329de 100644 3732 --- a/config/fuchsia/test/web_instance.shard.test-cml 3733 +++ b/config/fuchsia/test/web_instance.shard.test-cml 3734 @@ -3,12 +3,12 @@ 3735 // found in the LICENSE file. 3736 { 3737 include: [ 3738 - "//build/config/fuchsia/test/audio_output.shard.test-cml", 3739 - "//build/config/fuchsia/test/fonts.shard.test-cml", 3740 - "//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml", 3741 - "//build/config/fuchsia/test/network.shard.test-cml", 3742 - "//build/config/fuchsia/test/platform_video_codecs.shard.test-cml", 3743 - "//build/config/fuchsia/test/test_ui_stack.shard.test-cml", 3744 + "//chromium/build/config/fuchsia/test/audio_output.shard.test-cml", 3745 + "//chromium/build/config/fuchsia/test/fonts.shard.test-cml", 3746 + "//chromium/build/config/fuchsia/test/mark_vmo_executable.shard.test-cml", 3747 + "//chromium/build/config/fuchsia/test/network.shard.test-cml", 3748 + "//chromium/build/config/fuchsia/test/platform_video_codecs.shard.test-cml", 3749 + "//chromium/build/config/fuchsia/test/test_ui_stack.shard.test-cml", 3750 "vulkan/client.shard.cml", 3751 ], 3752 use: [ 3753 diff --git a/config/gcc/BUILD.gn b/config/gcc/BUILD.gn 3754 index a659210b1..6e291bb3c 100644 3755 --- a/config/gcc/BUILD.gn 3756 +++ b/config/gcc/BUILD.gn 3757 @@ -2,11 +2,11 @@ 3758 # Use of this source code is governed by a BSD-style license that can be 3759 # found in the LICENSE file. 3760 3761 -import("//build/config/c++/c++.gni") 3762 -import("//build/config/compiler/compiler.gni") 3763 -import("//build/config/sanitizers/sanitizers.gni") 3764 -import("//build/config/sysroot.gni") 3765 -import("//build/toolchain/toolchain.gni") 3766 +import("//chromium/build/config/c++/c++.gni") 3767 +import("//chromium/build/config/compiler/compiler.gni") 3768 +import("//chromium/build/config/sanitizers/sanitizers.gni") 3769 +import("//chromium/build/config/sysroot.gni") 3770 +import("//chromium/build/toolchain/toolchain.gni") 3771 3772 declare_args() { 3773 # When non empty, overrides the target rpath value. This allows a user to 3774 @@ -61,7 +61,7 @@ config("symbol_visibility_default") { 3775 # this is OK. For these cases use something like this: 3776 # 3777 # if ((is_linux || is_chromeos) && !is_component_build) { 3778 -# configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] 3779 +# configs += [ "//chromium/build/config/gcc:rpath_for_built_shared_libraries" ] 3780 # } 3781 config("rpath_for_built_shared_libraries") { 3782 if (!is_android && current_os != "aix" && !is_castos) { 3783 diff --git a/config/host_byteorder.gni b/config/host_byteorder.gni 3784 index 1c3c72dd6..6156e1496 100644 3785 --- a/config/host_byteorder.gni 3786 +++ b/config/host_byteorder.gni 3787 @@ -17,7 +17,7 @@ if (host_cpu == "ppc64") { 3788 } else { 3789 # Only use the script when absolutely necessary 3790 host_byteorder = 3791 - exec_script("//build/config/get_host_byteorder.py", [], "trim string") 3792 + exec_script("//chromium/build/config/get_host_byteorder.py", [], "trim string") 3793 } 3794 } else if (host_cpu == "ppc" || host_cpu == "s390" || host_cpu == "s390x" || 3795 host_cpu == "mips" || host_cpu == "mips64") { 3796 diff --git a/config/ios/BUILD.gn b/config/ios/BUILD.gn 3797 index a4db0c177..6296924b7 100644 3798 --- a/config/ios/BUILD.gn 3799 +++ b/config/ios/BUILD.gn 3800 @@ -2,13 +2,13 @@ 3801 # Use of this source code is governed by a BSD-style license that can be 3802 # found in the LICENSE file. 3803 3804 -import("//build/config/apple/mobile_config.gni") 3805 -import("//build/config/ios/config.gni") 3806 -import("//build/config/ios/ios_sdk.gni") 3807 -import("//build/toolchain/apple/toolchain.gni") 3808 -import("//build/toolchain/rbe.gni") 3809 -import("//build/toolchain/siso.gni") 3810 -import("//build/toolchain/toolchain.gni") 3811 +import("//chromium/build/config/apple/mobile_config.gni") 3812 +import("//chromium/build/config/ios/config.gni") 3813 +import("//chromium/build/config/ios/ios_sdk.gni") 3814 +import("//chromium/build/toolchain/apple/toolchain.gni") 3815 +import("//chromium/build/toolchain/rbe.gni") 3816 +import("//chromium/build/toolchain/siso.gni") 3817 +import("//chromium/build/toolchain/toolchain.gni") 3818 import("//build_overrides/build.gni") 3819 3820 # This is included by reference in the //build/config/compiler config that 3821 @@ -276,7 +276,7 @@ _xctrunner_path = 3822 if (ios_use_xcode_symlinks) { 3823 action("copy_xctrunner_app") { 3824 testonly = true 3825 - script = "//build/noop.py" 3826 + script = "//chromium/build/noop.py" 3827 outputs = [ 3828 "$_xctrunner_path/Info.plist", 3829 "$_xctrunner_path/PkgInfo", 3830 @@ -290,7 +290,7 @@ if (ios_use_xcode_symlinks) { 3831 # yet supported by Apple). 3832 action("xctest_runner_without_arm64e") { 3833 testonly = true 3834 - script = "//build/config/ios/strip_arm64e.py" 3835 + script = "//chromium/build/config/ios/strip_arm64e.py" 3836 sources = [ "$_xctrunner_path/XCTRunner" ] 3837 outputs = [ "$target_out_dir/XCTRunner" ] 3838 args = [ 3839 @@ -304,7 +304,7 @@ action("xctest_runner_without_arm64e") { 3840 3841 # When running under ASan, the ASan runtime library must be packaged alongside 3842 # the test runner binary. 3843 - deps = [ "//build/config/sanitizers:deps" ] 3844 + deps = [ "//chromium/build/config/sanitizers:deps" ] 3845 if (ios_use_xcode_symlinks) { 3846 deps += [ ":copy_xctrunner_app" ] 3847 } 3848 diff --git a/config/ios/config.gni b/config/ios/config.gni 3849 index 7d0d56369..4a0ac3555 100644 3850 --- a/config/ios/config.gni 3851 +++ b/config/ios/config.gni 3852 @@ -2,7 +2,7 @@ 3853 # Use of this source code is governed by a BSD-style license that can be 3854 # found in the LICENSE file. 3855 3856 -import("//build/config/apple/mobile_config.gni") 3857 +import("//chromium/build/config/apple/mobile_config.gni") 3858 3859 declare_args() { 3860 # Generate orderfile at application startup and then exit. 3861 diff --git a/config/ios/ios_sdk.gni b/config/ios/ios_sdk.gni 3862 index 9a0ea63dd..bb870b5b1 100644 3863 --- a/config/ios/ios_sdk.gni 3864 +++ b/config/ios/ios_sdk.gni 3865 @@ -2,11 +2,11 @@ 3866 # Use of this source code is governed by a BSD-style license that can be 3867 # found in the LICENSE file. 3868 3869 -import("//build/config/apple/mobile_config.gni") 3870 -import("//build/config/ios/ios_sdk_overrides.gni") 3871 -import("//build/toolchain/rbe.gni") 3872 -import("//build/toolchain/siso.gni") 3873 -import("//build/toolchain/toolchain.gni") 3874 +import("//chromium/build/config/apple/mobile_config.gni") 3875 +import("//chromium/build/config/ios/ios_sdk_overrides.gni") 3876 +import("//chromium/build/toolchain/rbe.gni") 3877 +import("//chromium/build/toolchain/siso.gni") 3878 +import("//chromium/build/toolchain/toolchain.gni") 3879 import("//build_overrides/build.gni") 3880 3881 assert(current_os == "ios") 3882 @@ -109,7 +109,7 @@ if (ios_sdk_path == "") { 3883 root_build_dir, 3884 ] 3885 } 3886 - script_name = "//build/config/apple/sdk_info.py" 3887 + script_name = "//chromium/build/config/apple/sdk_info.py" 3888 _ios_sdk_result = exec_script(script_name, ios_sdk_info_args, "scope") 3889 ios_bin_path = 3890 rebase_path("${_ios_sdk_result.toolchains_path}/usr/bin/", root_build_dir) 3891 diff --git a/config/ios/ios_sdk_overrides.gni b/config/ios/ios_sdk_overrides.gni 3892 index 4e5d71039..2dc3243ad 100644 3893 --- a/config/ios/ios_sdk_overrides.gni 3894 +++ b/config/ios/ios_sdk_overrides.gni 3895 @@ -5,7 +5,7 @@ 3896 # This file contains arguments that subprojects may choose to override. It 3897 # asserts that those overrides are used, to prevent unused args warnings. 3898 3899 -import("//build/config/features.gni") 3900 +import("//chromium/build/config/features.gni") 3901 3902 declare_args() { 3903 # Version of iOS that we're targeting. 3904 diff --git a/config/ios/ios_test_runner_wrapper.gni b/config/ios/ios_test_runner_wrapper.gni 3905 index 6fac03ff4..ffcd92004 100644 3906 --- a/config/ios/ios_test_runner_wrapper.gni 3907 +++ b/config/ios/ios_test_runner_wrapper.gni 3908 @@ -2,9 +2,9 @@ 3909 # Use of this source code is governed by a BSD-style license that can be 3910 # found in the LICENSE file. 3911 3912 -import("//build/config/coverage/coverage.gni") 3913 -import("//build/config/ios/ios_sdk.gni") 3914 -import("//build/util/generate_wrapper.gni") 3915 +import("//chromium/build/config/coverage/coverage.gni") 3916 +import("//chromium/build/config/ios/ios_sdk.gni") 3917 +import("//chromium/build/util/generate_wrapper.gni") 3918 3919 # Invokes generate_wrapper to create an executable script wrapping iOS' 3920 # run.py with baked in arguments. Only takes effect when test entry in 3921 @@ -149,7 +149,7 @@ template("ios_test_runner_wrapper") { 3922 "//ios/testing/plugin", 3923 3924 # exception reporting protos 3925 - "//build/util/lib/proto", 3926 + "//chromium/build/util/lib/proto", 3927 3928 # Variations test utilities used by variations_runner script. 3929 "//testing/scripts/variations_seed_access_helper.py", 3930 diff --git a/config/ios/ios_test_runner_xcuitest.gni b/config/ios/ios_test_runner_xcuitest.gni 3931 index 9da3341f5..1f5b2f71c 100644 3932 --- a/config/ios/ios_test_runner_xcuitest.gni 3933 +++ b/config/ios/ios_test_runner_xcuitest.gni 3934 @@ -2,8 +2,8 @@ 3935 # Use of this source code is governed by a BSD-style license that can be 3936 # found in the LICENSE file. 3937 3938 -import("//build/config/ios/ios_test_runner_wrapper.gni") 3939 -import("//build/config/ios/rules.gni") 3940 +import("//chromium/build/config/ios/ios_test_runner_wrapper.gni") 3941 +import("//chromium/build/config/ios/rules.gni") 3942 3943 # ios_test_runner_xcuitest are just ios_xcuitest_test with an 3944 # ios_test_runner_wrapper. Currently used by Crashpad tests, which do not depend 3945 diff --git a/config/ios/rules.gni b/config/ios/rules.gni 3946 index 290c1f326..e856096bd 100644 3947 --- a/config/ios/rules.gni 3948 +++ b/config/ios/rules.gni 3949 @@ -2,15 +2,15 @@ 3950 # Use of this source code is governed by a BSD-style license that can be 3951 # found in the LICENSE file. 3952 3953 -import("//build/apple/apple_info_plist.gni") 3954 -import("//build/config/apple/create_signed_bundle.gni") 3955 -import("//build/config/apple/mobile_bundle_data.gni") 3956 -import("//build/config/apple/symbols.gni") 3957 -import("//build/config/compiler/compiler.gni") 3958 -import("//build/config/ios/ios_sdk.gni") 3959 -import("//build/toolchain/rbe.gni") 3960 -import("//build/toolchain/siso.gni") 3961 -import("//build/toolchain/toolchain.gni") 3962 +import("//chromium/build/apple/apple_info_plist.gni") 3963 +import("//chromium/build/config/apple/create_signed_bundle.gni") 3964 +import("//chromium/build/config/apple/mobile_bundle_data.gni") 3965 +import("//chromium/build/config/apple/symbols.gni") 3966 +import("//chromium/build/config/compiler/compiler.gni") 3967 +import("//chromium/build/config/ios/ios_sdk.gni") 3968 +import("//chromium/build/toolchain/rbe.gni") 3969 +import("//chromium/build/toolchain/siso.gni") 3970 +import("//chromium/build/toolchain/toolchain.gni") 3971 import("//build_overrides/build.gni") 3972 3973 # iOS-specific wrapper around apple_mobile_create_signed_bundle. 3974 @@ -95,7 +95,7 @@ template("ios_info_plist") { 3975 extra_substitutions += invoker.extra_substitutions 3976 } 3977 plist_templates = [ 3978 - "//build/config/ios/BuildInfo.plist", 3979 + "//chromium/build/config/ios/BuildInfo.plist", 3980 _info_plist, 3981 ] 3982 if (defined(invoker.info_plist_target)) { 3983 @@ -359,7 +359,7 @@ template("ios_app_bundle") { 3984 _binary_path = "$target_out_dir/$_output_name" 3985 3986 visibility = [ ":$_metadata_bundledata" ] 3987 - script = "//build/config/ios/extract_metadata.py" 3988 + script = "//chromium/build/config/ios/extract_metadata.py" 3989 sources = [ 3990 _binary_path, 3991 _module_info_path, 3992 @@ -431,7 +431,7 @@ template("ios_app_bundle") { 3993 } 3994 3995 if (!defined(invoker.entitlements_target)) { 3996 - _entitlements_path = "//build/config/ios/entitlements.plist" 3997 + _entitlements_path = "//chromium/build/config/ios/entitlements.plist" 3998 if (defined(invoker.entitlements_path)) { 3999 _entitlements_path = invoker.entitlements_path 4000 } 4001 @@ -449,7 +449,7 @@ template("ios_app_bundle") { 4002 _gen_info_plist_outputs = get_target_outputs(":$_generate_info_plist") 4003 _info_plist_path = _gen_info_plist_outputs[0] 4004 4005 - script = "//build/config/apple/codesign.py" 4006 + script = "//chromium/build/config/apple/codesign.py" 4007 deps = [ ":$_generate_info_plist" ] 4008 if (defined(invoker.entitlements_target)) { 4009 deps += [ invoker.entitlements_target ] 4010 @@ -478,8 +478,8 @@ template("ios_app_bundle") { 4011 _create_pkg_info = target_name + "_pkg_info" 4012 action(_create_pkg_info) { 4013 forward_variables_from(invoker, [ "testonly" ]) 4014 - script = "//build/apple/write_pkg_info.py" 4015 - inputs = [ "//build/apple/plist_util.py" ] 4016 + script = "//chromium/build/apple/write_pkg_info.py" 4017 + inputs = [ "//chromium/build/apple/plist_util.py" ] 4018 sources = get_target_outputs(":$_generate_info_plist") 4019 outputs = [ 4020 # Cannot name the output PkgInfo as the name will not be unique if 4021 @@ -568,7 +568,7 @@ template("ios_app_bundle") { 4022 action(_target_name) { 4023 forward_variables_from(invoker, [ "testonly" ]) 4024 4025 - script = "//build/config/ios/hardlink.py" 4026 + script = "//chromium/build/config/ios/hardlink.py" 4027 public_deps = [] 4028 foreach(_variant, _variants) { 4029 public_deps += [ ":${_variant.target_name}" ] 4030 @@ -634,7 +634,7 @@ template("ios_appex_bundle") { 4031 } 4032 4033 set_defaults("ios_appex_bundle") { 4034 - configs = [ "//build/config/ios:ios_extension_executable_flags" ] 4035 + configs = [ "//chromium/build/config/ios:ios_extension_executable_flags" ] 4036 } 4037 4038 # Template to package a shared library into an iOS framework bundle. 4039 @@ -839,7 +839,7 @@ template("ios_framework_bundle") { 4040 "public_deps", 4041 "testonly", 4042 ]) 4043 - script = "//build/config/apple/write_framework_hmap.py" 4044 + script = "//chromium/build/config/apple/write_framework_hmap.py" 4045 outputs = [ _header_map_filename ] 4046 4047 # The header map generation only wants the list of headers, not all of 4048 @@ -864,7 +864,7 @@ template("ios_framework_bundle") { 4049 _create_module_map_target = _target_name + "_module_map" 4050 action(_create_module_map_target) { 4051 visibility = [ ":$_framework_headers_target" ] 4052 - script = "//build/config/apple/write_framework_modulemap.py" 4053 + script = "//chromium/build/config/apple/write_framework_modulemap.py" 4054 outputs = [ "$_framework_contents_dir/Modules/module.modulemap" ] 4055 args = [ 4056 _output_name, 4057 @@ -1101,7 +1101,7 @@ template("ios_xctest_bundle") { 4058 testonly = true 4059 visibility = [ ":$_target_name" ] 4060 4061 - configs += [ "//build/config/ios:xctest_config" ] 4062 + configs += [ "//chromium/build/config/ios:xctest_config" ] 4063 4064 output_dir = target_out_dir 4065 output_name = _output_name 4066 @@ -1120,7 +1120,7 @@ template("ios_xctest_bundle") { 4067 testonly = true 4068 visibility = [ ":$_info_plist_bundle" ] 4069 4070 - info_plist = "//build/config/ios/Module-Info.plist" 4071 + info_plist = "//chromium/build/config/ios/Module-Info.plist" 4072 executable_name = _output_name 4073 4074 if (defined(invoker.xctest_bundle_principal_class)) { 4075 @@ -1240,9 +1240,9 @@ template("ios_xctest_test") { 4076 _xctest_module_target_name = _xctest_target + "shell_source" 4077 _xctest_module_target = ":$_xctest_module_target_name" 4078 source_set(_xctest_module_target_name) { 4079 - sources = [ "//build/config/ios/xctest_shell.mm" ] 4080 + sources = [ "//chromium/build/config/ios/xctest_shell.mm" ] 4081 4082 - configs += [ "//build/config/ios:xctest_config" ] 4083 + configs += [ "//chromium/build/config/ios:xctest_config" ] 4084 } 4085 } 4086 4087 @@ -1267,10 +1267,10 @@ template("ios_xctest_test") { 4088 4089 testonly = true 4090 output_name = _host_output 4091 - configs += [ "//build/config/ios:xctest_config" ] 4092 + configs += [ "//chromium/build/config/ios:xctest_config" ] 4093 4094 if (!defined(invoker.info_plist) && !defined(invoker.info_plist_target)) { 4095 - info_plist = "//build/config/ios/Host-Info.plist" 4096 + info_plist = "//chromium/build/config/ios/Host-Info.plist" 4097 } 4098 4099 # Xcode needs the following frameworks installed in the application (and 4100 @@ -1356,7 +1356,7 @@ template("ios_xcuitest_test_runner_bundle") { 4101 4102 action(_info_plist_merge_plist) { 4103 testonly = true 4104 - script = "//build/apple/plist_util.py" 4105 + script = "//chromium/build/apple/plist_util.py" 4106 4107 sources = [ 4108 "$_xctrunner_path/Info.plist", 4109 @@ -1364,7 +1364,7 @@ template("ios_xcuitest_test_runner_bundle") { 4110 # NOTE: The XCTRunnerAddition+Info.plist must come after the Info.plist 4111 # because it overrides the values under "CFBundleIdentifier" and 4112 # "CFBundleName". 4113 - "//build/config/ios/resources/XCTRunnerAddition+Info.plist", 4114 + "//chromium/build/config/ios/resources/XCTRunnerAddition+Info.plist", 4115 ] 4116 4117 _output_name = "$target_gen_dir/${_target_name}_merged.plist" 4118 @@ -1377,7 +1377,7 @@ template("ios_xcuitest_test_runner_bundle") { 4119 ] + rebase_path(sources, root_build_dir) 4120 4121 if (ios_use_xcode_symlinks) { 4122 - deps = [ "//build/config/ios:copy_xctrunner_app" ] 4123 + deps = [ "//chromium/build/config/ios:copy_xctrunner_app" ] 4124 } 4125 } 4126 4127 @@ -1410,7 +1410,7 @@ template("ios_xcuitest_test_runner_bundle") { 4128 outputs = [ "{{bundle_contents_dir}}/PkgInfo" ] 4129 4130 if (ios_use_xcode_symlinks) { 4131 - public_deps = [ "//build/config/ios:copy_xctrunner_app" ] 4132 + public_deps = [ "//chromium/build/config/ios:copy_xctrunner_app" ] 4133 } 4134 } 4135 4136 @@ -1418,7 +1418,7 @@ template("ios_xcuitest_test_runner_bundle") { 4137 ios_create_signed_bundle(_target_name) { 4138 testonly = true 4139 4140 - bundle_binary_target = "//build/config/ios:xctest_runner_without_arm64e" 4141 + bundle_binary_target = "//chromium/build/config/ios:xctest_runner_without_arm64e" 4142 bundle_binary_output = "XCTRunner" 4143 bundle_extension = ".app" 4144 product_type = apple_mobile_xcode_app_bundle_id 4145 diff --git a/config/linux/BUILD.gn b/config/linux/BUILD.gn 4146 index b96e8cbe3..6ba0fde13 100644 4147 --- a/config/linux/BUILD.gn 4148 +++ b/config/linux/BUILD.gn 4149 @@ -2,10 +2,10 @@ 4150 # Use of this source code is governed by a BSD-style license that can be 4151 # found in the LICENSE file. 4152 4153 -import("//build/config/c++/c++.gni") 4154 -import("//build/config/chromeos/ui_mode.gni") 4155 -import("//build/config/linux/pkg_config.gni") 4156 -import("//build/config/ui.gni") 4157 +import("//chromium/build/config/c++/c++.gni") 4158 +import("//chromium/build/config/chromeos/ui_mode.gni") 4159 +import("//chromium/build/config/linux/pkg_config.gni") 4160 +import("//chromium/build/config/ui.gni") 4161 4162 group("linux") { 4163 visibility = [ "//:optimize_gn_gen" ] 4164 @@ -16,7 +16,7 @@ group("linux") { 4165 # Linux-only. This is not applied to Android, but is applied to ChromeOS. 4166 config("compiler") { 4167 if (current_cpu == "arm64") { 4168 - import("//build/config/arm.gni") 4169 + import("//chromium/build/config/arm.gni") 4170 cflags = [] 4171 asmflags = [] 4172 if (arm_control_flow_integrity == "standard") { 4173 @@ -42,7 +42,7 @@ config("runtime_library") { 4174 4175 # Mozilla disable libatomic on linux builds 4176 if (false) { 4177 - if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && 4178 + if ((!is_chromeos || default_toolchain != "//chromium/build/toolchain/cros:target") && 4179 (!use_custom_libcxx || current_cpu == "mipsel")) { 4180 libs = [ "atomic" ] 4181 } 4182 diff --git a/config/linux/atk/BUILD.gn b/config/linux/atk/BUILD.gn 4183 index 239c3870a..e771711f1 100644 4184 --- a/config/linux/atk/BUILD.gn 4185 +++ b/config/linux/atk/BUILD.gn 4186 @@ -2,10 +2,10 @@ 4187 # Use of this source code is governed by a BSD-style license that can be 4188 # found in the LICENSE file. 4189 4190 -import("//build/config/chromeos/ui_mode.gni") 4191 -import("//build/config/features.gni") 4192 -import("//build/config/linux/pkg_config.gni") 4193 -import("//build/config/ui.gni") 4194 +import("//chromium/build/config/chromeos/ui_mode.gni") 4195 +import("//chromium/build/config/features.gni") 4196 +import("//chromium/build/config/linux/pkg_config.gni") 4197 +import("//chromium/build/config/ui.gni") 4198 4199 # CrOS doesn't install GTK or any gnome packages. 4200 assert(!is_chromeos) 4201 diff --git a/config/linux/atspi2/BUILD.gn b/config/linux/atspi2/BUILD.gn 4202 index 30bc77f9c..5df799747 100644 4203 --- a/config/linux/atspi2/BUILD.gn 4204 +++ b/config/linux/atspi2/BUILD.gn 4205 @@ -2,8 +2,8 @@ 4206 # Use of this source code is governed by a BSD-style license that can be 4207 # found in the LICENSE file. 4208 4209 -import("//build/config/linux/pkg_config.gni") 4210 -import("//build/config/ui.gni") 4211 +import("//chromium/build/config/linux/pkg_config.gni") 4212 +import("//chromium/build/config/ui.gni") 4213 4214 # These packages should _only_ be expected when building for a target. 4215 assert(current_toolchain == default_toolchain) 4216 diff --git a/config/linux/dbus/BUILD.gn b/config/linux/dbus/BUILD.gn 4217 index 7dcc68bbd..36e4f3709 100644 4218 --- a/config/linux/dbus/BUILD.gn 4219 +++ b/config/linux/dbus/BUILD.gn 4220 @@ -2,9 +2,9 @@ 4221 # Use of this source code is governed by a BSD-style license that can be 4222 # found in the LICENSE file. 4223 4224 -import("//build/buildflag_header.gni") 4225 -import("//build/config/features.gni") 4226 -import("//build/config/linux/pkg_config.gni") 4227 +import("//chromium/build/buildflag_header.gni") 4228 +import("//chromium/build/config/features.gni") 4229 +import("//chromium/build/config/linux/pkg_config.gni") 4230 4231 buildflag_header("buildflags") { 4232 header = "buildflags.h" 4233 diff --git a/config/linux/dri/BUILD.gn b/config/linux/dri/BUILD.gn 4234 index e3a0a83a9..bdafaac36 100644 4235 --- a/config/linux/dri/BUILD.gn 4236 +++ b/config/linux/dri/BUILD.gn 4237 @@ -2,7 +2,7 @@ 4238 # Use of this source code is governed by a BSD-style license that can be 4239 # found in the LICENSE file. 4240 4241 -import("//build/config/linux/pkg_config.gni") 4242 +import("//chromium/build/config/linux/pkg_config.gni") 4243 4244 assert(is_linux, "This file should only be referenced on Linux") 4245 4246 diff --git a/config/linux/gtk/BUILD.gn b/config/linux/gtk/BUILD.gn 4247 index 449848757..f4583b901 100644 4248 --- a/config/linux/gtk/BUILD.gn 4249 +++ b/config/linux/gtk/BUILD.gn 4250 @@ -2,8 +2,8 @@ 4251 # Use of this source code is governed by a BSD-style license that can be 4252 # found in the LICENSE file. 4253 4254 -import("//build/config/linux/gtk/gtk.gni") 4255 -import("//build/config/linux/pkg_config.gni") 4256 +import("//chromium/build/config/linux/gtk/gtk.gni") 4257 +import("//chromium/build/config/linux/pkg_config.gni") 4258 4259 assert(is_linux, "This file should only be referenced on Linux") 4260 4261 diff --git a/config/linux/gtk/gtk.gni b/config/linux/gtk/gtk.gni 4262 index 4f560b290..927e11688 100644 4263 --- a/config/linux/gtk/gtk.gni 4264 +++ b/config/linux/gtk/gtk.gni 4265 @@ -2,7 +2,7 @@ 4266 # Use of this source code is governed by a BSD-style license that can be 4267 # found in the LICENSE file. 4268 4269 -import("//build/config/ui.gni") 4270 +import("//chromium/build/config/ui.gni") 4271 4272 declare_args() { 4273 # Whether or not we should use libgtk. 4274 diff --git a/config/linux/libdrm/BUILD.gn b/config/linux/libdrm/BUILD.gn 4275 index 7fd20c24e..bc7208540 100644 4276 --- a/config/linux/libdrm/BUILD.gn 4277 +++ b/config/linux/libdrm/BUILD.gn 4278 @@ -1,9 +1,9 @@ 4279 # Copyright 2018 The Chromium Authors 4280 # Use of this source code is governed by a BSD-style license that can be 4281 # found in the LICENSE file. 4282 -import("//build/config/cast.gni") 4283 -import("//build/config/chromeos/args.gni") 4284 -import("//build/config/linux/pkg_config.gni") 4285 +import("//chromium/build/config/cast.gni") 4286 +import("//chromium/build/config/chromeos/args.gni") 4287 +import("//chromium/build/config/linux/pkg_config.gni") 4288 4289 assert(is_linux || is_chromeos) 4290 4291 diff --git a/config/linux/libffi/BUILD.gn b/config/linux/libffi/BUILD.gn 4292 index 6e45f4c22..5c18bf6f5 100644 4293 --- a/config/linux/libffi/BUILD.gn 4294 +++ b/config/linux/libffi/BUILD.gn 4295 @@ -2,7 +2,7 @@ 4296 # Use of this source code is governed by a BSD-style license that can be 4297 # found in the LICENSE file. 4298 4299 -import("//build/config/linux/pkg_config.gni") 4300 +import("//chromium/build/config/linux/pkg_config.gni") 4301 4302 declare_args() { 4303 # Controls whether the build should use the version of libffi library shipped 4304 @@ -10,7 +10,7 @@ declare_args() { 4305 # on Linux, libffi must be statically linked to prevent a situation where the 4306 # runtime version of libffi is different from the build-time version from the 4307 # sysroot. 4308 - use_system_libffi = default_toolchain == "//build/toolchain/cros:target" 4309 + use_system_libffi = default_toolchain == "//chromium/build/toolchain/cros:target" 4310 } 4311 4312 if (use_system_libffi) { 4313 diff --git a/config/linux/libva/BUILD.gn b/config/linux/libva/BUILD.gn 4314 index 380da0435..0053888dd 100644 4315 --- a/config/linux/libva/BUILD.gn 4316 +++ b/config/linux/libva/BUILD.gn 4317 @@ -2,7 +2,7 @@ 4318 # Use of this source code is governed by a BSD-style license that can be 4319 # found in the LICENSE file. 4320 4321 -import("//build/config/linux/pkg_config.gni") 4322 +import("//chromium/build/config/linux/pkg_config.gni") 4323 4324 assert(is_linux || is_chromeos, "This file should only be referenced on Linux") 4325 4326 diff --git a/config/linux/nss/BUILD.gn b/config/linux/nss/BUILD.gn 4327 index c67cefc14..2b8f4b5cf 100644 4328 --- a/config/linux/nss/BUILD.gn 4329 +++ b/config/linux/nss/BUILD.gn 4330 @@ -2,7 +2,7 @@ 4331 # Use of this source code is governed by a BSD-style license that can be 4332 # found in the LICENSE file. 4333 4334 -import("//build/config/linux/pkg_config.gni") 4335 +import("//chromium/build/config/linux/pkg_config.gni") 4336 4337 if (is_linux || is_chromeos) { 4338 # This is a dependency on NSS with no libssl3. On Linux and Chrome OS, we use 4339 diff --git a/config/linux/pangocairo/BUILD.gn b/config/linux/pangocairo/BUILD.gn 4340 index e2030b817..4286dd90c 100644 4341 --- a/config/linux/pangocairo/BUILD.gn 4342 +++ b/config/linux/pangocairo/BUILD.gn 4343 @@ -2,8 +2,8 @@ 4344 # Use of this source code is governed by a BSD-style license that can be 4345 # found in the LICENSE file. 4346 4347 -import("//build/config/linux/pangocairo/pangocairo.gni") 4348 -import("//build/config/linux/pkg_config.gni") 4349 +import("//chromium/build/config/linux/pangocairo/pangocairo.gni") 4350 +import("//chromium/build/config/linux/pkg_config.gni") 4351 4352 if (use_pangocairo) { 4353 pkg_config("pangocairo") { 4354 diff --git a/config/linux/pangocairo/pangocairo.gni b/config/linux/pangocairo/pangocairo.gni 4355 index c7662ac33..b41da9fa6 100644 4356 --- a/config/linux/pangocairo/pangocairo.gni 4357 +++ b/config/linux/pangocairo/pangocairo.gni 4358 @@ -2,8 +2,8 @@ 4359 # Use of this source code is governed by a BSD-style license that can be 4360 # found in the LICENSE file. 4361 4362 -import("//build/config/chromeos/ui_mode.gni") 4363 -import("//build/config/ui.gni") 4364 +import("//chromium/build/config/chromeos/ui_mode.gni") 4365 +import("//chromium/build/config/ui.gni") 4366 4367 declare_args() { 4368 use_pangocairo = is_linux && !is_castos 4369 diff --git a/config/linux/pkg_config.gni b/config/linux/pkg_config.gni 4370 index 47fccd12b..c84606ae2 100644 4371 --- a/config/linux/pkg_config.gni 4372 +++ b/config/linux/pkg_config.gni 4373 @@ -2,8 +2,8 @@ 4374 # Use of this source code is governed by a BSD-style license that can be 4375 # found in the LICENSE file. 4376 4377 -import("//build/config/sysroot.gni") 4378 -import("//build/toolchain/rbe.gni") 4379 +import("//chromium/build/config/sysroot.gni") 4380 +import("//chromium/build/toolchain/rbe.gni") 4381 4382 # Defines a config specifying the result of running pkg-config for the given 4383 # packages. Put the package names you want to query in the "packages" variable 4384 @@ -48,7 +48,7 @@ declare_args() { 4385 system_libdir = "lib" 4386 } 4387 4388 -pkg_config_script = "//build/config/linux/pkg-config.py" 4389 +pkg_config_script = "//chromium/build/config/linux/pkg-config.py" 4390 4391 # Define the args we pass to the pkg-config script for other build files that 4392 # need to invoke it manually. 4393 diff --git a/config/locales.gni b/config/locales.gni 4394 index ed26f3de9..b23b608c7 100644 4395 --- a/config/locales.gni 4396 +++ b/config/locales.gni 4397 @@ -2,7 +2,7 @@ 4398 # Use of this source code is governed by a BSD-style license that can be 4399 # found in the LICENSE file. 4400 4401 -import("//build/config/chromeos/ui_mode.gni") 4402 +import("//chromium/build/config/chromeos/ui_mode.gni") 4403 4404 # This file creates |platform_pak_locales| which is the set of packed locales 4405 # based on the current platform. Locales in this list are formatted based on 4406 diff --git a/config/logging.gni b/config/logging.gni 4407 index 73915fef4..add300d00 100644 4408 --- a/config/logging.gni 4409 +++ b/config/logging.gni 4410 @@ -2,7 +2,7 @@ 4411 # Use of this source code is governed by a BSD-style license that can be 4412 # found in the LICENSE file. 4413 4414 -import("//build/config/compiler/compiler.gni") 4415 +import("//chromium/build/config/compiler/compiler.gni") 4416 4417 declare_args() { 4418 # Stack traces will not include function names. Instead they will contain 4419 diff --git a/config/loongarch64.gni b/config/loongarch64.gni 4420 index 9a95ec915..76e4c9378 100644 4421 --- a/config/loongarch64.gni 4422 +++ b/config/loongarch64.gni 4423 @@ -2,7 +2,7 @@ 4424 # Use of this source code is governed by a BSD-style license that can be 4425 # found in the LICENSE file. 4426 4427 -import("//build/config/v8_target_cpu.gni") 4428 +import("//chromium/build/config/v8_target_cpu.gni") 4429 4430 if (current_cpu == "loong64") { 4431 declare_args() { 4432 diff --git a/config/mac/BUILD.gn b/config/mac/BUILD.gn 4433 index 66ca06b7e..4d70334d3 100644 4434 --- a/config/mac/BUILD.gn 4435 +++ b/config/mac/BUILD.gn 4436 @@ -2,12 +2,12 @@ 4437 # Use of this source code is governed by a BSD-style license that can be 4438 # found in the LICENSE file. 4439 4440 -import("//build/config/apple/symbols.gni") 4441 -import("//build/config/c++/c++.gni") 4442 -import("//build/config/mac/mac_sdk.gni") 4443 -import("//build/config/sysroot.gni") 4444 -import("//build/toolchain/rbe.gni") 4445 -import("//build/toolchain/siso.gni") 4446 +import("//chromium/build/config/apple/symbols.gni") 4447 +import("//chromium/build/config/c++/c++.gni") 4448 +import("//chromium/build/config/mac/mac_sdk.gni") 4449 +import("//chromium/build/config/sysroot.gni") 4450 +import("//chromium/build/toolchain/rbe.gni") 4451 +import("//chromium/build/toolchain/siso.gni") 4452 4453 # This is included by reference in the //build/config/compiler config that 4454 # is applied to all targets. It is here to separate out the logic. 4455 @@ -101,7 +101,7 @@ config("mac_dynamic_flags") { 4456 # //build/config/apple/sdk_info.py in //build/config/mac/mac_sdk.gni. 4457 if (mac_use_xcode_symlinks && current_toolchain == default_toolchain) { 4458 action("sdk_inputs") { 4459 - script = "//build/noop.py" 4460 + script = "//chromium/build/noop.py" 4461 outputs = [ 4462 "$mac_sdk_path/usr/include/mach/exc.defs", 4463 "$mac_sdk_path/usr/include/mach/mach_exc.defs", 4464 diff --git a/config/mac/mac_sdk.gni b/config/mac/mac_sdk.gni 4465 index 1b8a4c8c0..85ac2ae8a 100644 4466 --- a/config/mac/mac_sdk.gni 4467 +++ b/config/mac/mac_sdk.gni 4468 @@ -2,12 +2,12 @@ 4469 # Use of this source code is governed by a BSD-style license that can be 4470 # found in the LICENSE file. 4471 4472 -import("//build/config/chrome_build.gni") 4473 -import("//build/config/gclient_args.gni") 4474 -import("//build/config/mac/mac_sdk_overrides.gni") 4475 -import("//build/toolchain/rbe.gni") 4476 -import("//build/toolchain/siso.gni") 4477 -import("//build/toolchain/toolchain.gni") 4478 +import("//chromium/build/config/chrome_build.gni") 4479 +import("//chromium/build/config/gclient_args.gni") 4480 +import("//chromium/build/config/mac/mac_sdk_overrides.gni") 4481 +import("//chromium/build/toolchain/rbe.gni") 4482 +import("//chromium/build/toolchain/siso.gni") 4483 +import("//chromium/build/toolchain/toolchain.gni") 4484 4485 # Allow Android builds on macOS 4486 assert(current_os == "mac" || current_toolchain == default_toolchain || 4487 @@ -79,10 +79,10 @@ if (is_chrome_branded && is_official_build && target_os != "ios") { 4488 # The path to the hermetic install of Xcode. Only relevant when 4489 # use_system_xcode = false. 4490 if (!use_system_xcode) { 4491 - _hermetic_xcode_path = "//build/mac_files/xcode_binaries" 4492 + _hermetic_xcode_path = "//chromium/build/mac_files/xcode_binaries" 4493 } 4494 4495 -script_name = "//build/config/apple/sdk_info.py" 4496 +script_name = "//chromium/build/config/apple/sdk_info.py" 4497 sdk_info_args = [] 4498 if (!use_system_xcode) { 4499 sdk_info_args += [ 4500 @@ -147,7 +147,7 @@ if (use_system_xcode) { 4501 mac_sdk_min, 4502 ] 4503 find_sdk_lines = 4504 - exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines") 4505 + exec_script("//chromium/build/mac/find_sdk.py", find_sdk_args, "list lines") 4506 mac_sdk_version = find_sdk_lines[3] 4507 mac_sdk_build_version = find_sdk_lines[2] 4508 if (mac_sdk_path == "") { 4509 diff --git a/config/mac/rules.gni b/config/mac/rules.gni 4510 index b4ee8b890..e66e94294 100644 4511 --- a/config/mac/rules.gni 4512 +++ b/config/mac/rules.gni 4513 @@ -2,9 +2,9 @@ 4514 # Use of this source code is governed by a BSD-style license that can be 4515 # found in the LICENSE file. 4516 4517 -import("//build/apple/apple_info_plist.gni") 4518 -import("//build/config/apple/symbols.gni") 4519 -import("//build/config/mac/mac_sdk.gni") 4520 +import("//chromium/build/apple/apple_info_plist.gni") 4521 +import("//chromium/build/config/apple/symbols.gni") 4522 +import("//chromium/build/config/mac/mac_sdk.gni") 4523 4524 _sanitizer_runtime_names = [] 4525 if (is_asan) { 4526 @@ -60,7 +60,7 @@ template("mac_info_plist") { 4527 extra_substitutions += invoker.extra_substitutions 4528 } 4529 plist_templates = [ 4530 - "//build/config/mac/BuildInfo.plist", 4531 + "//chromium/build/config/mac/BuildInfo.plist", 4532 _info_plist, 4533 ] 4534 if (defined(invoker.info_plist_target)) { 4535 @@ -238,7 +238,7 @@ template("mac_framework_bundle") { 4536 4537 # Clean the entire framework if the framework_version changes. 4538 _version_file = "$target_out_dir/${target_name}_version" 4539 - exec_script("//build/config/mac/prepare_framework_version.py", 4540 + exec_script("//chromium/build/config/mac/prepare_framework_version.py", 4541 [ 4542 rebase_path(_version_file), 4543 rebase_path(_framework_base_dir), 4544 @@ -248,7 +248,7 @@ template("mac_framework_bundle") { 4545 # Create the symlinks. 4546 _framework_package_target = target_name + "_package" 4547 action(_framework_package_target) { 4548 - script = "//build/config/mac/package_framework.py" 4549 + script = "//chromium/build/config/mac/package_framework.py" 4550 4551 # The TOC file never needs to be read, since its contents are the values 4552 # of GN variables. It is only used to trigger this rule when the values 4553 @@ -469,8 +469,8 @@ template("mac_app_bundle") { 4554 4555 action(_pkg_info_target) { 4556 forward_variables_from(invoker, [ "testonly" ]) 4557 - script = "//build/apple/write_pkg_info.py" 4558 - inputs = [ "//build/apple/plist_util.py" ] 4559 + script = "//chromium/build/apple/write_pkg_info.py" 4560 + inputs = [ "//chromium/build/apple/plist_util.py" ] 4561 sources = get_target_outputs(":$_info_plist_target") 4562 outputs = [ "$target_gen_dir/$_pkg_info_target" ] 4563 args = [ "--plist" ] + rebase_path(sources, root_build_dir) + 4564 diff --git a/config/mips.gni b/config/mips.gni 4565 index 986ffcb45..2df1646a8 100644 4566 --- a/config/mips.gni 4567 +++ b/config/mips.gni 4568 @@ -2,7 +2,7 @@ 4569 # Use of this source code is governed by a BSD-style license that can be 4570 # found in the LICENSE file. 4571 4572 -import("//build/config/v8_target_cpu.gni") 4573 +import("//chromium/build/config/v8_target_cpu.gni") 4574 4575 # These are primarily relevant in current_cpu == "mips*" contexts, where 4576 # MIPS code is being compiled. But they can also be relevant in the 4577 diff --git a/config/nacl/BUILD.gn b/config/nacl/BUILD.gn 4578 index 77b04d71b..13489657f 100644 4579 --- a/config/nacl/BUILD.gn 4580 +++ b/config/nacl/BUILD.gn 4581 @@ -2,7 +2,7 @@ 4582 # Use of this source code is governed by a BSD-style license that can be 4583 # found in the LICENSE file. 4584 4585 -import("//build/config/nacl/config.gni") 4586 +import("//chromium/build/config/nacl/config.gni") 4587 4588 # Native Client Definitions 4589 config("nacl_defines") { 4590 diff --git a/config/nacl/config.gni b/config/nacl/config.gni 4591 index c8062b41a..dd774495e 100644 4592 --- a/config/nacl/config.gni 4593 +++ b/config/nacl/config.gni 4594 @@ -49,5 +49,5 @@ nacl_toolchain_tooldir = 4595 "${nacl_toolchain_dir}/${nacl_toolchain_package}/${_nacl_tuple}" 4596 nacl_toolprefix = "${nacl_toolchain_bindir}/${_nacl_tuple}-" 4597 4598 -nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + current_cpu 4599 +nacl_irt_toolchain = "//chromium/build/toolchain/nacl:irt_" + current_cpu 4600 is_nacl_irt = current_toolchain == nacl_irt_toolchain 4601 diff --git a/config/nacl/host_toolchain.gni b/config/nacl/host_toolchain.gni 4602 index 6bb2221ae..f877fe47b 100644 4603 --- a/config/nacl/host_toolchain.gni 4604 +++ b/config/nacl/host_toolchain.gni 4605 @@ -3,8 +3,8 @@ 4606 # found in the LICENSE file. 4607 4608 default_nacl_bootstrap_compiler = "g++" 4609 -if (default_toolchain == "//build/toolchain/cros:target") { 4610 - import("//build/toolchain/cros_toolchain.gni") 4611 +if (default_toolchain == "//chromium/build/toolchain/cros:target") { 4612 + import("//chromium/build/toolchain/cros_toolchain.gni") 4613 if (target_cpu == "arm64" && current_cpu == "arm") { 4614 default_nacl_bootstrap_compiler = cros_nacl_helper_arm32_cxx 4615 } else { 4616 diff --git a/config/nacl/rules.gni b/config/nacl/rules.gni 4617 index a15d32622..7d916e8f5 100644 4618 --- a/config/nacl/rules.gni 4619 +++ b/config/nacl/rules.gni 4620 @@ -2,7 +2,7 @@ 4621 # Use of this source code is governed by a BSD-style license that can be 4622 # found in the LICENSE file. 4623 4624 -import("//build/config/nacl/config.gni") 4625 +import("//chromium/build/config/nacl/config.gni") 4626 4627 # Generate a nmf file 4628 # 4629 @@ -101,7 +101,7 @@ template("generate_nmf") { 4630 if (current_cpu == "x64" || target_os == "win") { 4631 # For x86-64, the lib/ directory is called lib64/ instead 4632 # when copied by create_nmf.py. 4633 - glibc_tc = "//build/toolchain/nacl:glibc" 4634 + glibc_tc = "//chromium/build/toolchain/nacl:glibc" 4635 assert(current_toolchain == "${glibc_tc}_${current_cpu}") 4636 if (current_cpu == "x64") { 4637 x64_out_dir = root_out_dir 4638 diff --git a/config/ozone.gni b/config/ozone.gni 4639 index a74459ca9..9d98d891f 100644 4640 --- a/config/ozone.gni 4641 +++ b/config/ozone.gni 4642 @@ -2,8 +2,8 @@ 4643 # Use of this source code is governed by a BSD-style license that can be 4644 # found in the LICENSE file. 4645 4646 -import("//build/config/cast.gni") 4647 -import("//build/toolchain/toolchain.gni") 4648 +import("//chromium/build/config/cast.gni") 4649 +import("//chromium/build/toolchain/toolchain.gni") 4650 4651 declare_args() { 4652 # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux 4653 @@ -14,7 +14,7 @@ declare_args() { 4654 declare_args() { 4655 # Ozone extra platforms file path. Can be overridden to build out of 4656 # tree ozone platforms. 4657 - ozone_extra_path = "//build/config/ozone_extra.gni" 4658 + ozone_extra_path = "//chromium/build/config/ozone_extra.gni" 4659 4660 # Select platforms automatically. Turn this off for manual control. 4661 ozone_auto_platforms = use_ozone 4662 diff --git a/config/pch.gni b/config/pch.gni 4663 index 6f8504ae4..34d573193 100644 4664 --- a/config/pch.gni 4665 +++ b/config/pch.gni 4666 @@ -2,9 +2,9 @@ 4667 # Use of this source code is governed by a BSD-style license that can be 4668 # found in the LICENSE file. 4669 4670 -import("//build/toolchain/cc_wrapper.gni") 4671 -import("//build/toolchain/rbe.gni") 4672 -import("//build/toolchain/siso.gni") 4673 +import("//chromium/build/toolchain/cc_wrapper.gni") 4674 +import("//chromium/build/toolchain/rbe.gni") 4675 +import("//chromium/build/toolchain/siso.gni") 4676 4677 declare_args() { 4678 # Precompiled header file support is by default available, except on the 4679 diff --git a/config/posix/BUILD.gn b/config/posix/BUILD.gn 4680 index 9638527df..ec40cbe68 100644 4681 --- a/config/posix/BUILD.gn 4682 +++ b/config/posix/BUILD.gn 4683 @@ -2,7 +2,7 @@ 4684 # Use of this source code is governed by a BSD-style license that can be 4685 # found in the LICENSE file. 4686 4687 -import("//build/config/sysroot.gni") 4688 +import("//chromium/build/config/sysroot.gni") 4689 4690 # This build configuration is used by both Fuchsia and POSIX systems. 4691 assert(is_posix || is_fuchsia) 4692 @@ -33,7 +33,7 @@ config("runtime_library") { 4693 # when turning the sysroot on or off. (defines are passed via the command 4694 # line, and build system rebuilds things when their commandline 4695 # changes). Nothing should ever read this define. 4696 - import("//build/linux/sysroot_scripts/sysroot.gni") 4697 + import("//chromium/build/linux/sysroot_scripts/sysroot.gni") 4698 defines += [ "CR_SYSROOT_KEY=$cr_sysroot_key" ] 4699 } 4700 asmflags += sysroot_flags 4701 diff --git a/config/profiling/profiling.gni b/config/profiling/profiling.gni 4702 index d30ef7456..f45647613 100644 4703 --- a/config/profiling/profiling.gni 4704 +++ b/config/profiling/profiling.gni 4705 @@ -2,8 +2,8 @@ 4706 # Use of this source code is governed by a BSD-style license that can be 4707 # found in the LICENSE file. 4708 4709 -import("//build/config/compiler/pgo/pgo.gni") 4710 -import("//build/config/coverage/coverage.gni") 4711 +import("//chromium/build/config/compiler/pgo/pgo.gni") 4712 +import("//chromium/build/config/coverage/coverage.gni") 4713 4714 declare_args() { 4715 use_clang_profiling = 4716 diff --git a/config/python.gni b/config/python.gni 4717 index f3431fcc0..36c46e008 100644 4718 --- a/config/python.gni 4719 +++ b/config/python.gni 4720 @@ -67,8 +67,8 @@ template("python_library") { 4721 # associated .pydeps file. In other words: 4722 # 4723 # - This is very similar to just an action(), except that |script| must point 4724 -# to a Python script (e.g. "//build/.../foo.py") that has a corresponding 4725 -# .pydeps file in the source tree (e.g. "//build/.../foo.pydeps"). 4726 +# to a Python script (e.g. "//chromium/build/.../foo.py") that has a corresponding 4727 +# .pydeps file in the source tree (e.g. "//chromium/build/.../foo.pydeps"). 4728 # 4729 # - The .pydeps file contains a list of python dependencies (imports really) 4730 # and is generated _manually_ by using a command like: 4731 diff --git a/config/riscv.gni b/config/riscv.gni 4732 index 3e8e42533..afe2c7aee 100644 4733 --- a/config/riscv.gni 4734 +++ b/config/riscv.gni 4735 @@ -2,7 +2,7 @@ 4736 # Use of this source code is governed by a BSD-style license that can be 4737 # found in the LICENSE file. 4738 4739 -import("//build/config/v8_target_cpu.gni") 4740 +import("//chromium/build/config/v8_target_cpu.gni") 4741 4742 if (current_cpu == "riscv64" || v8_current_cpu == "riscv64" || 4743 current_cpu == "riscv32" || v8_current_cpu == "riscv32") { 4744 diff --git a/config/rust.gni b/config/rust.gni 4745 index 74b3b9ced..0b032436a 100644 4746 --- a/config/rust.gni 4747 +++ b/config/rust.gni 4748 @@ -2,18 +2,18 @@ 4749 # Use of this source code is governed by a BSD-style license that can be 4750 # found in the LICENSE file. 4751 4752 -import("//build/config/chrome_build.gni") 4753 -import("//build/config/compiler/compiler.gni") 4754 -import("//build/config/sanitizers/sanitizers.gni") 4755 -import("//build/toolchain/toolchain.gni") 4756 +import("//chromium/build/config/chrome_build.gni") 4757 +import("//chromium/build/config/compiler/compiler.gni") 4758 +import("//chromium/build/config/sanitizers/sanitizers.gni") 4759 +import("//chromium/build/toolchain/toolchain.gni") 4760 4761 if (is_android) { 4762 - import("//build/config/android/config.gni") 4763 + import("//chromium/build/config/android/config.gni") 4764 } 4765 4766 if (is_ios) { 4767 # For `target_environment` and `target_platform`. 4768 - import("//build/config/apple/mobile_config.gni") 4769 + import("//chromium/build/config/apple/mobile_config.gni") 4770 } 4771 4772 declare_args() { 4773 @@ -219,7 +219,7 @@ if (is_linux || is_chromeos) { 4774 cargo_target_abi = "" 4775 } 4776 } else if (is_android) { 4777 - import("//build/config/android/abi.gni") 4778 + import("//chromium/build/config/android/abi.gni") 4779 if (android_abi_target == "i686-linux-android") { 4780 rust_abi_target = android_abi_target 4781 cargo_target_abi = "" 4782 diff --git a/config/sanitizers/BUILD.gn b/config/sanitizers/BUILD.gn 4783 index b854fda66..3f1e1f285 100644 4784 --- a/config/sanitizers/BUILD.gn 4785 +++ b/config/sanitizers/BUILD.gn 4786 @@ -2,16 +2,16 @@ 4787 # Use of this source code is governed by a BSD-style license that can be 4788 # found in the LICENSE file. 4789 4790 -import("//build/config/cast.gni") 4791 -import("//build/config/chrome_build.gni") 4792 -import("//build/config/clang/clang.gni") 4793 -import("//build/config/rust.gni") 4794 -import("//build/config/sanitizers/sanitizers.gni") 4795 -import("//build/toolchain/toolchain.gni") 4796 +import("//chromium/build/config/cast.gni") 4797 +import("//chromium/build/config/chrome_build.gni") 4798 +import("//chromium/build/config/clang/clang.gni") 4799 +import("//chromium/build/config/rust.gni") 4800 +import("//chromium/build/config/sanitizers/sanitizers.gni") 4801 +import("//chromium/build/toolchain/toolchain.gni") 4802 import("//build_overrides/build.gni") 4803 4804 if (is_ios) { 4805 - import("//build/config/apple/mobile_config.gni") 4806 + import("//chromium/build/config/apple/mobile_config.gni") 4807 } 4808 4809 declare_args() { 4810 @@ -125,7 +125,7 @@ if ((is_apple || is_win) && (is_asan || is_ubsan_any)) { 4811 # On iOS, the runtime library need to be code signed (adhoc signature) 4812 # starting with Xcode 8, so use an action instead of a copy on iOS. 4813 action("copy_sanitizer_runtime") { 4814 - script = "//build/config/apple/codesign.py" 4815 + script = "//chromium/build/config/apple/codesign.py" 4816 sources = [ _clang_rt_dso_full_path ] 4817 outputs = [ "$root_out_dir/" + get_path_info(sources[0], "file") ] 4818 args = [ 4819 @@ -161,30 +161,30 @@ static_library("options_sources") { 4820 ":deps", 4821 "//:gn_all", 4822 ] 4823 - sources = [ "//build/sanitizers/sanitizer_options.cc" ] 4824 + sources = [ "//chromium/build/sanitizers/sanitizer_options.cc" ] 4825 4826 # Don't compile this target with any sanitizer code. It can be called from 4827 # the sanitizer runtimes, so instrumenting these functions could cause 4828 # recursive calls into the runtime if there is an error. 4829 - configs -= [ "//build/config/sanitizers:default_sanitizer_flags" ] 4830 + configs -= [ "//chromium/build/config/sanitizers:default_sanitizer_flags" ] 4831 4832 if (is_asan) { 4833 if (!defined(asan_suppressions_file)) { 4834 - asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc" 4835 + asan_suppressions_file = "//chromium/build/sanitizers/asan_suppressions.cc" 4836 } 4837 sources += [ asan_suppressions_file ] 4838 } 4839 4840 if (is_lsan) { 4841 if (!defined(lsan_suppressions_file)) { 4842 - lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc" 4843 + lsan_suppressions_file = "//chromium/build/sanitizers/lsan_suppressions.cc" 4844 } 4845 sources += [ lsan_suppressions_file ] 4846 } 4847 4848 if (is_tsan) { 4849 if (!defined(tsan_suppressions_file)) { 4850 - tsan_suppressions_file = "//build/sanitizers/tsan_suppressions.cc" 4851 + tsan_suppressions_file = "//chromium/build/sanitizers/tsan_suppressions.cc" 4852 } 4853 sources += [ tsan_suppressions_file ] 4854 } 4855 @@ -192,7 +192,7 @@ static_library("options_sources") { 4856 4857 if (use_dlcloseshim) { 4858 source_set("dlclose_shim") { 4859 - sources = [ "//build/sanitizers/dlcloseshim.c" ] 4860 + sources = [ "//chromium/build/sanitizers/dlcloseshim.c" ] 4861 } 4862 } else { 4863 group("dlclose_shim") { 4864 @@ -679,7 +679,7 @@ config("not_fuzzed") { 4865 # optimize_for_fuzzing (-O1). When given multiple optimization flags, clang 4866 # obeys the last one, so as long as this flag comes after -O1, it should work. 4867 # Since this config will always be depended on after 4868 - # "//build/config/compiler:default_optimization" (which adds -O1 when 4869 + # "//chromium/build/config/compiler:default_optimization" (which adds -O1 when 4870 # optimize_for_fuzzing is true), -O2 should always be the second flag. Even 4871 # though this sounds fragile, it isn't a big deal if it breaks, since proto 4872 # fuzzers will still work, they will just be slightly slower. 4873 diff --git a/config/sanitizers/sanitizers.gni b/config/sanitizers/sanitizers.gni 4874 index 3acf256e7..105b28470 100644 4875 --- a/config/sanitizers/sanitizers.gni 4876 +++ b/config/sanitizers/sanitizers.gni 4877 @@ -2,12 +2,12 @@ 4878 # Use of this source code is governed by a BSD-style license that can be 4879 # found in the LICENSE file. 4880 4881 -import("//build/config/cast.gni") 4882 -import("//build/config/chrome_build.gni") 4883 -import("//build/config/chromeos/args.gni") 4884 -import("//build/config/chromeos/ui_mode.gni") 4885 -import("//build/config/profiling/profiling.gni") 4886 -import("//build/toolchain/toolchain.gni") 4887 +import("//chromium/build/config/cast.gni") 4888 +import("//chromium/build/config/chrome_build.gni") 4889 +import("//chromium/build/config/chromeos/args.gni") 4890 +import("//chromium/build/config/chromeos/ui_mode.gni") 4891 +import("//chromium/build/config/profiling/profiling.gni") 4892 +import("//chromium/build/toolchain/toolchain.gni") 4893 4894 declare_args() { 4895 # Compile for Address Sanitizer to find memory bugs. 4896 @@ -376,21 +376,21 @@ not_fuzzed_remove_nonasan_configs = [] 4897 4898 if (use_fuzzing_engine) { 4899 # Removing coverage should always just work. 4900 - not_fuzzed_remove_configs += [ "//build/config/coverage:default_coverage" ] 4901 + not_fuzzed_remove_configs += [ "//chromium/build/config/coverage:default_coverage" ] 4902 not_fuzzed_remove_nonasan_configs += 4903 - [ "//build/config/coverage:default_coverage" ] 4904 + [ "//chromium/build/config/coverage:default_coverage" ] 4905 4906 if (!is_msan) { 4907 # Allow sanitizer instrumentation to be removed if we are not using MSan 4908 # since binaries cannot be partially instrumented with MSan. 4909 not_fuzzed_remove_configs += 4910 - [ "//build/config/sanitizers:default_sanitizer_flags" ] 4911 + [ "//chromium/build/config/sanitizers:default_sanitizer_flags" ] 4912 4913 # Certain parts of binaries must be instrumented with ASan if the rest of 4914 # the binary is. For these, only remove non-ASan sanitizer instrumentation. 4915 if (!is_asan) { 4916 not_fuzzed_remove_nonasan_configs += 4917 - [ "//build/config/sanitizers:default_sanitizer_flags" ] 4918 + [ "//chromium/build/config/sanitizers:default_sanitizer_flags" ] 4919 4920 assert(not_fuzzed_remove_nonasan_configs == not_fuzzed_remove_configs) 4921 } 4922 @@ -400,8 +400,8 @@ if (use_fuzzing_engine) { 4923 # Options common to different fuzzer engines. 4924 # Engine should be compiled without coverage (infinite loop in trace_cmp). 4925 fuzzing_engine_remove_configs = [ 4926 - "//build/config/coverage:default_coverage", 4927 - "//build/config/sanitizers:default_sanitizer_flags", 4928 + "//chromium/build/config/coverage:default_coverage", 4929 + "//chromium/build/config/sanitizers:default_sanitizer_flags", 4930 ] 4931 4932 # Add any sanitizer flags back. In MSAN builds, instrumenting libfuzzer with 4933 @@ -414,4 +414,4 @@ fuzzing_engine_remove_configs = [ 4934 # expecting one particular ABI (https://crbug.com/915422). The other sanitizers 4935 # are added back for the same reason. 4936 fuzzing_engine_add_configs = 4937 - [ "//build/config/sanitizers:default_sanitizer_flags_but_coverage" ] 4938 + [ "//chromium/build/config/sanitizers:default_sanitizer_flags_but_coverage" ] 4939 diff --git a/config/sysroot.gni b/config/sysroot.gni 4940 index 71eedaaaf..6d96c685d 100644 4941 --- a/config/sysroot.gni 4942 +++ b/config/sysroot.gni 4943 @@ -11,7 +11,7 @@ declare_args() { 4944 target_sysroot = "" 4945 4946 # The path to directory containing linux sysroot images. 4947 - target_sysroot_dir = "//build/linux" 4948 + target_sysroot_dir = "//chromium/build/linux" 4949 4950 # The path of the sysroot for the current toolchain. If empty, default 4951 # sysroot is used. 4952 @@ -30,7 +30,7 @@ if (sysroot == "") { 4953 target_sysroot != "") { 4954 sysroot = target_sysroot 4955 } else if (is_android) { 4956 - import("//build/config/android/config.gni") 4957 + import("//chromium/build/config/android/config.gni") 4958 4959 # Android uses unified headers, and thus a single compile time sysroot 4960 sysroot = "$android_toolchain_root/sysroot" 4961 @@ -65,13 +65,13 @@ if (sysroot == "") { 4962 # "Missing sysroot ($sysroot). To fix, run: build/linux/sysroot_scripts/install-sysroot.py --arch=$_script_arch") 4963 } 4964 } else if (is_mac) { 4965 - import("//build/config/mac/mac_sdk.gni") 4966 + import("//chromium/build/config/mac/mac_sdk.gni") 4967 sysroot = mac_sdk_path 4968 } else if (is_ios) { 4969 - import("//build/config/ios/ios_sdk.gni") 4970 + import("//chromium/build/config/ios/ios_sdk.gni") 4971 sysroot = ios_sdk_path 4972 } else if (is_fuchsia) { 4973 - import("//build/config/fuchsia/gn_configs.gni") 4974 + import("//chromium/build/config/fuchsia/gn_configs.gni") 4975 sysroot = "${fuchsia_arch_root}/sysroot" 4976 } 4977 } 4978 diff --git a/config/ui.gni b/config/ui.gni 4979 index 20e446e34..af652c777 100644 4980 --- a/config/ui.gni 4981 +++ b/config/ui.gni 4982 @@ -17,10 +17,10 @@ 4983 # There is more advice on where to put build flags in the "Build flag" section 4984 # of //build/config/BUILDCONFIG.gn. 4985 4986 -import("//build/config/cast.gni") 4987 -import("//build/config/chromeos/args.gni") 4988 -import("//build/config/chromeos/ui_mode.gni") 4989 -import("//build/config/ozone.gni") 4990 +import("//chromium/build/config/cast.gni") 4991 +import("//chromium/build/config/chromeos/args.gni") 4992 +import("//chromium/build/config/chromeos/ui_mode.gni") 4993 +import("//chromium/build/config/ozone.gni") 4994 4995 declare_args() { 4996 # Indicates if Aura is enabled. Aura is a low-level windowing library, sort 4997 diff --git a/config/v8_target_cpu.gni b/config/v8_target_cpu.gni 4998 index 6c41226a6..cc165effb 100644 4999 --- a/config/v8_target_cpu.gni 5000 +++ b/config/v8_target_cpu.gni 5001 @@ -2,7 +2,7 @@ 5002 # Use of this source code is governed by a BSD-style license that can be 5003 # found in the LICENSE file. 5004 5005 -import("//build/config/sanitizers/sanitizers.gni") 5006 +import("//chromium/build/config/sanitizers/sanitizers.gni") 5007 5008 declare_args() { 5009 # This arg is used when we want to tell the JIT-generating v8 code 5010 @@ -34,18 +34,18 @@ declare_args() { 5011 } 5012 5013 if (v8_target_cpu == "") { 5014 - if (current_toolchain == "//build/toolchain/linux:clang_x64_v8_arm64") { 5015 + if (current_toolchain == "//chromium/build/toolchain/linux:clang_x64_v8_arm64") { 5016 v8_target_cpu = "arm64" 5017 - } else if (current_toolchain == "//build/toolchain/linux:clang_x86_v8_arm") { 5018 + } else if (current_toolchain == "//chromium/build/toolchain/linux:clang_x86_v8_arm") { 5019 v8_target_cpu = "arm" 5020 } else if (current_toolchain == 5021 - "//build/toolchain/linux:clang_x86_v8_mips64el") { 5022 + "//chromium/build/toolchain/linux:clang_x86_v8_mips64el") { 5023 v8_target_cpu = "mips64el" 5024 } else if (current_toolchain == 5025 - "//build/toolchain/linux:clang_x86_v8_mipsel") { 5026 + "//chromium/build/toolchain/linux:clang_x86_v8_mipsel") { 5027 v8_target_cpu = "mipsel" 5028 } else if (current_toolchain == 5029 - "//build/toolchain/linux:clang_x64_v8_riscv64") { 5030 + "//chromium/build/toolchain/linux:clang_x64_v8_riscv64") { 5031 v8_target_cpu = "riscv64" 5032 } else if (is_msan) { 5033 # If we're running under a sanitizer, if we configure v8 to generate 5034 diff --git a/config/win/BUILD.gn b/config/win/BUILD.gn 5035 index e656a35e2..94bf8c16c 100644 5036 --- a/config/win/BUILD.gn 5037 +++ b/config/win/BUILD.gn 5038 @@ -2,17 +2,17 @@ 5039 # Use of this source code is governed by a BSD-style license that can be 5040 # found in the LICENSE file. 5041 5042 -import("//build/config/c++/c++.gni") 5043 -import("//build/config/chrome_build.gni") 5044 -import("//build/config/clang/clang.gni") 5045 -import("//build/config/compiler/compiler.gni") 5046 -import("//build/config/rust.gni") 5047 -import("//build/config/sanitizers/sanitizers.gni") 5048 -import("//build/config/win/control_flow_guard.gni") 5049 -import("//build/config/win/visual_studio_version.gni") 5050 -import("//build/timestamp.gni") 5051 -import("//build/toolchain/rbe.gni") 5052 -import("//build/toolchain/toolchain.gni") 5053 +import("//chromium/build/config/c++/c++.gni") 5054 +import("//chromium/build/config/chrome_build.gni") 5055 +import("//chromium/build/config/clang/clang.gni") 5056 +import("//chromium/build/config/compiler/compiler.gni") 5057 +import("//chromium/build/config/rust.gni") 5058 +import("//chromium/build/config/sanitizers/sanitizers.gni") 5059 +import("//chromium/build/config/win/control_flow_guard.gni") 5060 +import("//chromium/build/config/win/visual_studio_version.gni") 5061 +import("//chromium/build/timestamp.gni") 5062 +import("//chromium/build/toolchain/rbe.gni") 5063 +import("//chromium/build/toolchain/toolchain.gni") 5064 5065 assert(is_win) 5066 5067 @@ -128,7 +128,7 @@ config("compiler") { 5068 # doesn't understand ANSI escape codes by default). Make sure to not enable 5069 # this if remoteexec is in use, because this will lower cache hits. 5070 if (!use_remoteexec && 5071 - exec_script("//build/win/use_ansi_codes.py", [], "trim string") == 5072 + exec_script("//chromium/build/win/use_ansi_codes.py", [], "trim string") == 5073 "True") { 5074 cflags += [ "-fansi-escape-codes" ] 5075 } 5076 @@ -485,7 +485,7 @@ group("maybe_set_appcontainer_acls") { 5077 5078 if (build_with_chromium && current_cpu == target_cpu && host_os == "win") { 5079 action("set_appcontainer_acls") { 5080 - script = "//build/win/set_appcontainer_acls.py" 5081 + script = "//chromium/build/win/set_appcontainer_acls.py" 5082 stamp_file = "$target_out_dir/acls.stamp" 5083 inputs = [ script ] 5084 outputs = [ stamp_file ] 5085 diff --git a/config/win/console_app.gni b/config/win/console_app.gni 5086 index 038801e9f..5264410f1 100644 5087 --- a/config/win/console_app.gni 5088 +++ b/config/win/console_app.gni 5089 @@ -2,7 +2,7 @@ 5090 # Use of this source code is governed by a BSD-style license that can be 5091 # found in the LICENSE file. 5092 5093 -import("//build/config/sanitizers/sanitizers.gni") 5094 +import("//chromium/build/config/sanitizers/sanitizers.gni") 5095 5096 declare_args() { 5097 # If true, builds as a console app (rather than a windowed app), which allows 5098 diff --git a/config/win/control_flow_guard.gni b/config/win/control_flow_guard.gni 5099 index 176947f7f..76f082332 100644 5100 --- a/config/win/control_flow_guard.gni 5101 +++ b/config/win/control_flow_guard.gni 5102 @@ -2,7 +2,7 @@ 5103 # Use of this source code is governed by a BSD-style license that can be 5104 # found in the LICENSE file. 5105 5106 -import("//build/config/sanitizers/sanitizers.gni") 5107 +import("//chromium/build/config/sanitizers/sanitizers.gni") 5108 5109 declare_args() { 5110 # Set this to true to enable generation of CFG indirect call dispatch 5111 diff --git a/config/win/manifest.gni b/config/win/manifest.gni 5112 index e1859eacd..05e8a1a9a 100644 5113 --- a/config/win/manifest.gni 5114 +++ b/config/win/manifest.gni 5115 @@ -26,26 +26,26 @@ 5116 5117 # Reference this manifest as a source from windows_manifest targets to get 5118 # the default Chrome OS compatibility list. 5119 -default_compatibility_manifest = "//build/win/compatibility.manifest" 5120 +default_compatibility_manifest = "//chromium/build/win/compatibility.manifest" 5121 5122 # Reference this manifest as a source from windows_manifest targets to get 5123 # the default Chrome common constrols compatibility. 5124 -common_controls_manifest = "//build/win/common_controls.manifest" 5125 +common_controls_manifest = "//chromium/build/win/common_controls.manifest" 5126 5127 # Reference this manifest to request that Windows not perform any elevation 5128 # when running your program. Otherwise, it might do some autodetection and 5129 # request elevated privileges from the user. This is normally what you want. 5130 -as_invoker_manifest = "//build/win/as_invoker.manifest" 5131 +as_invoker_manifest = "//chromium/build/win/as_invoker.manifest" 5132 5133 # An alternative to as_invoker_manifest when you want the application to always 5134 # elevate. 5135 -require_administrator_manifest = "//build/win/require_administrator.manifest" 5136 +require_administrator_manifest = "//chromium/build/win/require_administrator.manifest" 5137 5138 # Request the segment heap. See https://crbug.com/1014701 for details. 5139 declare_args() { 5140 enable_segment_heap = false 5141 } 5142 -segment_heap_manifest = "//build/win/segment_heap.manifest" 5143 +segment_heap_manifest = "//chromium/build/win/segment_heap.manifest" 5144 5145 # Construct a target to combine the given manifest files into a .rc file. 5146 # 5147 diff --git a/config/zip.gni b/config/zip.gni 5148 index d623a0d0a..679a0d536 100644 5149 --- a/config/zip.gni 5150 +++ b/config/zip.gni 5151 @@ -29,7 +29,7 @@ template("zip") { 5152 "testonly", 5153 "visibility", 5154 ]) 5155 - script = "//build/android/gyp/zip.py" 5156 + script = "//chromium/build/android/gyp/zip.py" 5157 inputs = invoker.inputs 5158 outputs = [ invoker.output ] 5159 5160 diff --git a/config/zos/BUILD.gn b/config/zos/BUILD.gn 5161 index 6d41055b4..c41d5237b 100644 5162 --- a/config/zos/BUILD.gn 5163 +++ b/config/zos/BUILD.gn 5164 @@ -2,8 +2,8 @@ 5165 # Use of this source code is governed by a BSD-style license that can be 5166 # found in the LICENSE file. 5167 5168 -import("//build/config/sanitizers/sanitizers.gni") 5169 -import("//build/toolchain/toolchain.gni") 5170 +import("//chromium/build/config/sanitizers/sanitizers.gni") 5171 +import("//chromium/build/toolchain/toolchain.gni") 5172 5173 # This is included by reference in the //build/config/compiler config that 5174 # is applied to all targets. It is here to specify defines and flags that 5175 diff --git a/dotfile_settings.gni b/dotfile_settings.gni 5176 index f0a0a01d9..8105ba99c 100644 5177 --- a/dotfile_settings.gni 5178 +++ b/dotfile_settings.gni 5179 @@ -7,39 +7,39 @@ 5180 5181 build_dotfile_settings = { 5182 exec_script_allowlist = [ 5183 - "//build/config/android/rules.gni", 5184 - "//build/config/apple/mobile_config.gni", 5185 - "//build/config/chromeos/rules.gni", 5186 - "//build/config/clang/BUILD.gn", 5187 - "//build/config/compiler/BUILD.gn", 5188 - "//build/config/compiler/pgo/BUILD.gn", 5189 - "//build/config/gcc/gcc_version.gni", 5190 - "//build/config/host_byteorder.gni", 5191 - "//build/config/ios/ios_sdk.gni", 5192 - "//build/config/ios/rules.gni", 5193 - "//build/config/linux/atk/BUILD.gn", 5194 - "//build/config/linux/atspi2/BUILD.gn", 5195 - "//build/config/linux/BUILD.gn", 5196 - "//build/config/linux/dri/BUILD.gn", 5197 - "//build/config/linux/pkg_config.gni", 5198 - "//build/config/mac/mac_sdk.gni", 5199 - "//build/config/mac/rules.gni", 5200 - "//build/config/posix/BUILD.gn", 5201 - "//build/config/rust.gni", 5202 - "//build/config/win/BUILD.gn", 5203 - "//build/config/win/visual_studio_version.gni", 5204 - "//build/rust/analyze.gni", 5205 - "//build/timestamp.gni", 5206 - "//build/toolchain/apple/toolchain.gni", 5207 - "//build/toolchain/BUILD.gn", 5208 - "//build/toolchain/concurrent_links.gni", 5209 - "//build/toolchain/nacl/BUILD.gn", 5210 - "//build/toolchain/rbe.gni", 5211 - "//build/toolchain/toolchain.gni", 5212 - "//build/toolchain/win/BUILD.gn", 5213 - "//build/toolchain/win/win_toolchain_data.gni", 5214 - "//build/toolchain/zos/BUILD.gn", 5215 - "//build/util/branding.gni", 5216 + "//chromium/build/config/android/rules.gni", 5217 + "//chromium/build/config/apple/mobile_config.gni", 5218 + "//chromium/build/config/chromeos/rules.gni", 5219 + "//chromium/build/config/clang/BUILD.gn", 5220 + "//chromium/build/config/compiler/BUILD.gn", 5221 + "//chromium/build/config/compiler/pgo/BUILD.gn", 5222 + "//chromium/build/config/gcc/gcc_version.gni", 5223 + "//chromium/build/config/host_byteorder.gni", 5224 + "//chromium/build/config/ios/ios_sdk.gni", 5225 + "//chromium/build/config/ios/rules.gni", 5226 + "//chromium/build/config/linux/atk/BUILD.gn", 5227 + "//chromium/build/config/linux/atspi2/BUILD.gn", 5228 + "//chromium/build/config/linux/BUILD.gn", 5229 + "//chromium/build/config/linux/dri/BUILD.gn", 5230 + "//chromium/build/config/linux/pkg_config.gni", 5231 + "//chromium/build/config/mac/mac_sdk.gni", 5232 + "//chromium/build/config/mac/rules.gni", 5233 + "//chromium/build/config/posix/BUILD.gn", 5234 + "//chromium/build/config/rust.gni", 5235 + "//chromium/build/config/win/BUILD.gn", 5236 + "//chromium/build/config/win/visual_studio_version.gni", 5237 + "//chromium/build/rust/analyze.gni", 5238 + "//chromium/build/timestamp.gni", 5239 + "//chromium/build/toolchain/apple/toolchain.gni", 5240 + "//chromium/build/toolchain/BUILD.gn", 5241 + "//chromium/build/toolchain/concurrent_links.gni", 5242 + "//chromium/build/toolchain/nacl/BUILD.gn", 5243 + "//chromium/build/toolchain/rbe.gni", 5244 + "//chromium/build/toolchain/toolchain.gni", 5245 + "//chromium/build/toolchain/win/BUILD.gn", 5246 + "//chromium/build/toolchain/win/win_toolchain_data.gni", 5247 + "//chromium/build/toolchain/zos/BUILD.gn", 5248 + "//chromium/build/util/branding.gni", 5249 ] 5250 5251 # TODO(crbug.com/389986807) - move other clients to `exec_script_allowlist` 5252 diff --git a/fuchsia/DIR_METADATA b/fuchsia/DIR_METADATA 5253 index 210aa6a95..ddd134a2b 100644 5254 --- a/fuchsia/DIR_METADATA 5255 +++ b/fuchsia/DIR_METADATA 5256 @@ -1 +1 @@ 5257 -mixins: "//build/fuchsia/COMMON_METADATA" 5258 +mixins: "//chromium/build/fuchsia/COMMON_METADATA" 5259 diff --git a/fuchsia/cipd/BUILD.gn b/fuchsia/cipd/BUILD.gn 5260 index 0b0834c59..5099df706 100644 5261 --- a/fuchsia/cipd/BUILD.gn 5262 +++ b/fuchsia/cipd/BUILD.gn 5263 @@ -6,10 +6,10 @@ 5264 5265 assert(is_fuchsia) 5266 5267 -import("//build/cipd/cipd.gni") 5268 -import("//build/config/chrome_build.gni") 5269 -import("//build/config/compiler/compiler.gni") 5270 -import("//build/util/process_version.gni") 5271 +import("//chromium/build/cipd/cipd.gni") 5272 +import("//chromium/build/config/chrome_build.gni") 5273 +import("//chromium/build/config/compiler/compiler.gni") 5274 +import("//chromium/build/util/process_version.gni") 5275 import("//third_party/fuchsia-gn-sdk/src/build_id_dir.gni") 5276 import("//third_party/fuchsia-gn-sdk/src/cipd.gni") 5277 5278 @@ -261,7 +261,7 @@ action("strip_chromedriver_binary") { 5279 prog_name = "${root_out_dir}/clang_x64/chromedriver" 5280 5281 deps = [ "//chrome/test/chromedriver:chromedriver_server($host_toolchain)" ] 5282 - script = "//build/gn_run_binary.py" 5283 + script = "//chromium/build/gn_run_binary.py" 5284 sources = [ 5285 "//buildtools/third_party/eu-strip/bin/eu-strip", 5286 prog_name, 5287 diff --git a/fuchsia/cipd/DIR_METADATA b/fuchsia/cipd/DIR_METADATA 5288 index 210aa6a95..ddd134a2b 100644 5289 --- a/fuchsia/cipd/DIR_METADATA 5290 +++ b/fuchsia/cipd/DIR_METADATA 5291 @@ -1 +1 @@ 5292 -mixins: "//build/fuchsia/COMMON_METADATA" 5293 +mixins: "//chromium/build/fuchsia/COMMON_METADATA" 5294 diff --git a/fuchsia/test/BUILD.gn b/fuchsia/test/BUILD.gn 5295 index 333dc48f1..f1b49e527 100644 5296 --- a/fuchsia/test/BUILD.gn 5297 +++ b/fuchsia/test/BUILD.gn 5298 @@ -2,7 +2,7 @@ 5299 # Use of this source code is governed by a BSD-style license that can be 5300 # found in the LICENSE file. 5301 5302 -import("//build/config/python.gni") 5303 +import("//chromium/build/config/python.gni") 5304 5305 python_library("version") { 5306 data = [ 5307 @@ -13,7 +13,7 @@ python_library("version") { 5308 5309 python_library("gs_util_wrapper") { 5310 data = [ 5311 - "//build/find_depot_tools.py", 5312 + "//chromium/build/find_depot_tools.py", 5313 "//third_party/depot_tools/", 5314 "gs_util_wrapper.py", 5315 ] 5316 diff --git a/fuchsia/test/run_pytype.py b/fuchsia/test/run_pytype.py 5317 index 8e603313c..c7c3f873f 100755 5318 --- a/fuchsia/test/run_pytype.py 5319 +++ b/fuchsia/test/run_pytype.py 5320 @@ -27,7 +27,7 @@ FILES_AND_DIRECTORIES_TO_CHECK = [ 5321 os.path.join(FUCHSIA_TEST_DIR, f) for f in COVERED_FILES 5322 ] 5323 TEST_NAME = 'fuchsia_pytype' 5324 -TEST_LOCATION = "//build/fuchsia/test/run_pytype.py" 5325 +TEST_LOCATION = "//chromium/build/fuchsia/test/run_pytype.py" 5326 5327 5328 def main() -> int: 5329 diff --git a/gn_logs.gni b/gn_logs.gni 5330 index df49ddab1..4c2c6abb7 100644 5331 --- a/gn_logs.gni 5332 +++ b/gn_logs.gni 5333 @@ -2,9 +2,9 @@ 5334 # Use of this source code is governed by a BSD-style license that can be 5335 # found in the LICENSE file. 5336 5337 -import("//build/config/compiler/compiler.gni") 5338 -import("//build/toolchain/concurrent_links.gni") 5339 -import("//build/toolchain/rbe.gni") 5340 +import("//chromium/build/config/compiler/compiler.gni") 5341 +import("//chromium/build/toolchain/concurrent_links.gni") 5342 +import("//chromium/build/toolchain/rbe.gni") 5343 5344 build_gn_logs = [ "### rbe.gni ###" ] + rbe_logs 5345 build_gn_logs += [ "" ] 5346 @@ -14,14 +14,14 @@ build_gn_logs += [ "### compiler.gni ###" ] + compiler_logs 5347 build_gn_logs += [ "" ] 5348 5349 if (target_os == "android") { 5350 - import("//build/config/android/config.gni") 5351 + import("//chromium/build/config/android/config.gni") 5352 build_gn_logs += [ "### android/config.gni ###" ] + android_logs 5353 build_gn_logs += [ "" ] 5354 } 5355 5356 if (target_os == "ios") { 5357 - import("//build/config/ios/ios_sdk.gni") 5358 - import("//build/config/mac/mac_sdk.gni") 5359 + import("//chromium/build/config/ios/ios_sdk.gni") 5360 + import("//chromium/build/config/mac/mac_sdk.gni") 5361 build_gn_logs += [ "### ios_sdk.gni ###" ] + ios_sdk_logs 5362 build_gn_logs += [ "" ] 5363 build_gn_logs += [ "### mac_sdk.gni ###" ] + mac_sdk_logs 5364 @@ -29,20 +29,20 @@ if (target_os == "ios") { 5365 } 5366 5367 if (target_os == "mac") { 5368 - import("//build/config/mac/mac_sdk.gni") 5369 + import("//chromium/build/config/mac/mac_sdk.gni") 5370 build_gn_logs += [ "### mac_sdk.gni ###" ] + mac_sdk_logs 5371 build_gn_logs += [ "" ] 5372 } 5373 5374 if (target_os == "win") { 5375 - import("//build/config/win/visual_studio_version.gni") 5376 + import("//chromium/build/config/win/visual_studio_version.gni") 5377 build_gn_logs += 5378 [ "### visual_studio_version.gni ###" ] + visual_studio_version_logs 5379 build_gn_logs += [ "" ] 5380 } 5381 5382 if (target_os == "fuchsia") { 5383 - import("//build/config/fuchsia/gn_configs.gni") 5384 + import("//chromium/build/config/fuchsia/gn_configs.gni") 5385 build_gn_logs += [ "### fuchsia/gn_configs.gni ###" ] + fuchsia_gn_logs 5386 build_gn_logs += [ "" ] 5387 } 5388 diff --git a/ios/intent_definition.gni b/ios/intent_definition.gni 5389 index 652ff6684..00c447663 100644 5390 --- a/ios/intent_definition.gni 5391 +++ b/ios/intent_definition.gni 5392 @@ -2,7 +2,7 @@ 5393 # Use of this source code is governed by a BSD-style license that can be 5394 # found in the LICENSE file. 5395 5396 -import("//build/config/ios/ios_sdk.gni") 5397 +import("//chromium/build/config/ios/ios_sdk.gni") 5398 5399 # Template to compile an .intentdefinition file. 5400 # 5401 @@ -34,7 +34,7 @@ template("intent_definition") { 5402 "$target_gen_dir/" + get_path_info(invoker.intent_file, "file") 5403 5404 action(_compile_intent_target) { 5405 - script = "//build/apple/xcrun.py" 5406 + script = "//chromium/build/apple/xcrun.py" 5407 inputs = [ invoker.intent_file ] 5408 outputs = [ _compile_intent_output ] 5409 args = [ 5410 @@ -71,7 +71,7 @@ template("intent_definition") { 5411 } 5412 5413 action(_generate_source_target) { 5414 - script = "//build/apple/xcrun.py" 5415 + script = "//chromium/build/apple/xcrun.py" 5416 inputs = [ invoker.intent_file ] 5417 outputs = _generate_source_output 5418 args = [ 5419 diff --git a/linux/BUILD.gn b/linux/BUILD.gn 5420 index 653951df5..a3d8267f8 100644 5421 --- a/linux/BUILD.gn 5422 +++ b/linux/BUILD.gn 5423 @@ -2,9 +2,9 @@ 5424 # Use of this source code is governed by a BSD-style license that can be 5425 # found in the LICENSE file. 5426 5427 -import("//build/config/features.gni") 5428 -import("//build/config/freetype/freetype.gni") 5429 -import("//build/config/linux/pkg_config.gni") 5430 +import("//chromium/build/config/features.gni") 5431 +import("//chromium/build/config/freetype/freetype.gni") 5432 +import("//chromium/build/config/linux/pkg_config.gni") 5433 5434 if (use_gio) { 5435 pkg_config("gio_config") { 5436 @@ -26,7 +26,7 @@ if (use_system_freetype) { 5437 # the system, use with caution,for details see build/config/freetype/BUILD.gn. 5438 pkg_config("freetype_from_pkgconfig") { 5439 visibility = [ 5440 - "//build/config/freetype:freetype", 5441 + "//chromium/build/config/freetype:freetype", 5442 "//third_party:freetype_harfbuzz", 5443 "//third_party/harfbuzz-ng:harfbuzz_source", 5444 ] 5445 diff --git a/linux/extract_symbols.gni b/linux/extract_symbols.gni 5446 index 26426c8aa..af40a7cd8 100644 5447 --- a/linux/extract_symbols.gni 5448 +++ b/linux/extract_symbols.gni 5449 @@ -2,7 +2,7 @@ 5450 # Use of this source code is governed by a BSD-style license that can be 5451 # found in the LICENSE file. 5452 5453 -import("//build/toolchain/toolchain.gni") 5454 +import("//chromium/build/toolchain/toolchain.gni") 5455 5456 # Extracts symbols from a binary into a symbol file using dump_app_syms.py. 5457 # 5458 @@ -23,8 +23,8 @@ template("extract_symbols") { 5459 dump_syms_binary = 5460 get_label_info(dump_syms_label, "root_out_dir") + "/" + "dump_syms" 5461 5462 - pool = "//build/toolchain:link_pool($default_toolchain)" 5463 - script = "//build/linux/dump_app_syms.py" 5464 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 5465 + script = "//chromium/build/linux/dump_app_syms.py" 5466 inputs = [ 5467 invoker.binary, 5468 dump_syms_binary, 5469 diff --git a/linux/strip_binary.gni b/linux/strip_binary.gni 5470 index 3675d39a5..fd4aed705 100644 5471 --- a/linux/strip_binary.gni 5472 +++ b/linux/strip_binary.gni 5473 @@ -2,7 +2,7 @@ 5474 # Use of this source code is governed by a BSD-style license that can be 5475 # found in the LICENSE file. 5476 5477 -import("//build/toolchain/toolchain.gni") 5478 +import("//chromium/build/toolchain/toolchain.gni") 5479 5480 # Extracts symbols from a binary into a symbol file. 5481 # 5482 @@ -21,7 +21,7 @@ template("strip_binary") { 5483 ]) 5484 action("${target_name}") { 5485 eu_strip_binary = "//buildtools/third_party/eu-strip/bin/eu-strip" 5486 - script = "//build/linux/strip_binary.py" 5487 + script = "//chromium/build/linux/strip_binary.py" 5488 5489 if (defined(invoker.stripped_binary_output)) { 5490 stripped_binary_output = invoker.stripped_binary_output 5491 diff --git a/linux/unbundle/absl_algorithm.gn b/linux/unbundle/absl_algorithm.gn 5492 index cc41c6861..09067ebe9 100644 5493 --- a/linux/unbundle/absl_algorithm.gn 5494 +++ b/linux/unbundle/absl_algorithm.gn 5495 @@ -1,5 +1,5 @@ 5496 -import("//build/config/linux/pkg_config.gni") 5497 -import("//build/shim_headers.gni") 5498 +import("//chromium/build/config/linux/pkg_config.gni") 5499 +import("//chromium/build/shim_headers.gni") 5500 5501 pkg_config("system_absl_algorithm_container") { 5502 packages = [ "absl_algorithm_container" ] 5503 diff --git a/linux/unbundle/absl_base.gn b/linux/unbundle/absl_base.gn 5504 index b5ce0863e..1243bdac9 100644 5505 --- a/linux/unbundle/absl_base.gn 5506 +++ b/linux/unbundle/absl_base.gn 5507 @@ -1,5 +1,5 @@ 5508 -import("//build/config/linux/pkg_config.gni") 5509 -import("//build/shim_headers.gni") 5510 +import("//chromium/build/config/linux/pkg_config.gni") 5511 +import("//chromium/build/shim_headers.gni") 5512 5513 pkg_config("system_absl_base") { 5514 packages = [ "absl_base" ] 5515 diff --git a/linux/unbundle/absl_cleanup.gn b/linux/unbundle/absl_cleanup.gn 5516 index 61455edf3..31086cf1d 100644 5517 --- a/linux/unbundle/absl_cleanup.gn 5518 +++ b/linux/unbundle/absl_cleanup.gn 5519 @@ -1,5 +1,5 @@ 5520 -import("//build/config/linux/pkg_config.gni") 5521 -import("//build/shim_headers.gni") 5522 +import("//chromium/build/config/linux/pkg_config.gni") 5523 +import("//chromium/build/shim_headers.gni") 5524 5525 pkg_config("system_absl_cleanup") { 5526 packages = [ "absl_cleanup" ] 5527 diff --git a/linux/unbundle/absl_container.gn b/linux/unbundle/absl_container.gn 5528 index e211c911c..e7b728e21 100644 5529 --- a/linux/unbundle/absl_container.gn 5530 +++ b/linux/unbundle/absl_container.gn 5531 @@ -1,5 +1,5 @@ 5532 -import("//build/config/linux/pkg_config.gni") 5533 -import("//build/shim_headers.gni") 5534 +import("//chromium/build/config/linux/pkg_config.gni") 5535 +import("//chromium/build/shim_headers.gni") 5536 5537 pkg_config("system_absl_btree") { 5538 packages = [ "absl_btree" ] 5539 diff --git a/linux/unbundle/absl_debugging.gn b/linux/unbundle/absl_debugging.gn 5540 index b59a45b09..127f1e45f 100644 5541 --- a/linux/unbundle/absl_debugging.gn 5542 +++ b/linux/unbundle/absl_debugging.gn 5543 @@ -1,5 +1,5 @@ 5544 -import("//build/config/linux/pkg_config.gni") 5545 -import("//build/shim_headers.gni") 5546 +import("//chromium/build/config/linux/pkg_config.gni") 5547 +import("//chromium/build/shim_headers.gni") 5548 5549 pkg_config("system_absl_failure_signal_handler") { 5550 packages = [ "absl_failure_signal_handler" ] 5551 diff --git a/linux/unbundle/absl_flags.gn b/linux/unbundle/absl_flags.gn 5552 index cb0358399..16aa24e18 100644 5553 --- a/linux/unbundle/absl_flags.gn 5554 +++ b/linux/unbundle/absl_flags.gn 5555 @@ -1,5 +1,5 @@ 5556 -import("//build/config/linux/pkg_config.gni") 5557 -import("//build/shim_headers.gni") 5558 +import("//chromium/build/config/linux/pkg_config.gni") 5559 +import("//chromium/build/shim_headers.gni") 5560 5561 pkg_config("absl_flags_config") { 5562 # This target is referenced by //third_party/abseil-cpp:absl_full_deps 5563 diff --git a/linux/unbundle/absl_functional.gn b/linux/unbundle/absl_functional.gn 5564 index a996eb7b7..0ce9c0f1a 100644 5565 --- a/linux/unbundle/absl_functional.gn 5566 +++ b/linux/unbundle/absl_functional.gn 5567 @@ -1,5 +1,5 @@ 5568 -import("//build/config/linux/pkg_config.gni") 5569 -import("//build/shim_headers.gni") 5570 +import("//chromium/build/config/linux/pkg_config.gni") 5571 +import("//chromium/build/shim_headers.gni") 5572 5573 pkg_config("system_absl_any_invocable") { 5574 packages = [ "absl_any_invocable" ] 5575 diff --git a/linux/unbundle/absl_hash.gn b/linux/unbundle/absl_hash.gn 5576 index 1388ba811..c36ea4bf3 100644 5577 --- a/linux/unbundle/absl_hash.gn 5578 +++ b/linux/unbundle/absl_hash.gn 5579 @@ -1,5 +1,5 @@ 5580 -import("//build/config/linux/pkg_config.gni") 5581 -import("//build/shim_headers.gni") 5582 +import("//chromium/build/config/linux/pkg_config.gni") 5583 +import("//chromium/build/shim_headers.gni") 5584 5585 pkg_config("system_absl_hash") { 5586 packages = [ "absl_hash" ] 5587 diff --git a/linux/unbundle/absl_log.gn b/linux/unbundle/absl_log.gn 5588 index d5c06506d..fdc111e2b 100644 5589 --- a/linux/unbundle/absl_log.gn 5590 +++ b/linux/unbundle/absl_log.gn 5591 @@ -1,5 +1,5 @@ 5592 -import("//build/config/linux/pkg_config.gni") 5593 -import("//build/shim_headers.gni") 5594 +import("//chromium/build/config/linux/pkg_config.gni") 5595 +import("//chromium/build/shim_headers.gni") 5596 5597 pkg_config("system_absl_absl_check") { 5598 packages = [ "absl_absl_check" ] 5599 diff --git a/linux/unbundle/absl_memory.gn b/linux/unbundle/absl_memory.gn 5600 index 5d6abe87f..144e32ec1 100644 5601 --- a/linux/unbundle/absl_memory.gn 5602 +++ b/linux/unbundle/absl_memory.gn 5603 @@ -1,5 +1,5 @@ 5604 -import("//build/config/linux/pkg_config.gni") 5605 -import("//build/shim_headers.gni") 5606 +import("//chromium/build/config/linux/pkg_config.gni") 5607 +import("//chromium/build/shim_headers.gni") 5608 5609 pkg_config("system_absl_memory") { 5610 packages = [ "absl_memory" ] 5611 diff --git a/linux/unbundle/absl_meta.gn b/linux/unbundle/absl_meta.gn 5612 index 7f79a06cc..494d790f3 100644 5613 --- a/linux/unbundle/absl_meta.gn 5614 +++ b/linux/unbundle/absl_meta.gn 5615 @@ -1,5 +1,5 @@ 5616 -import("//build/config/linux/pkg_config.gni") 5617 -import("//build/shim_headers.gni") 5618 +import("//chromium/build/config/linux/pkg_config.gni") 5619 +import("//chromium/build/shim_headers.gni") 5620 5621 pkg_config("system_absl_type_traits") { 5622 packages = [ "absl_type_traits" ] 5623 diff --git a/linux/unbundle/absl_numeric.gn b/linux/unbundle/absl_numeric.gn 5624 index 660263161..3d9da1718 100644 5625 --- a/linux/unbundle/absl_numeric.gn 5626 +++ b/linux/unbundle/absl_numeric.gn 5627 @@ -1,5 +1,5 @@ 5628 -import("//build/config/linux/pkg_config.gni") 5629 -import("//build/shim_headers.gni") 5630 +import("//chromium/build/config/linux/pkg_config.gni") 5631 +import("//chromium/build/shim_headers.gni") 5632 5633 pkg_config("system_absl_bits") { 5634 packages = [ "absl_bits" ] 5635 diff --git a/linux/unbundle/absl_random.gn b/linux/unbundle/absl_random.gn 5636 index eae95345e..2a05d6b20 100644 5637 --- a/linux/unbundle/absl_random.gn 5638 +++ b/linux/unbundle/absl_random.gn 5639 @@ -1,5 +1,5 @@ 5640 -import("//build/config/linux/pkg_config.gni") 5641 -import("//build/shim_headers.gni") 5642 +import("//chromium/build/config/linux/pkg_config.gni") 5643 +import("//chromium/build/shim_headers.gni") 5644 5645 pkg_config("system_absl_random_bit_gen_ref") { 5646 packages = [ "absl_random_bit_gen_ref" ] 5647 diff --git a/linux/unbundle/absl_status.gn b/linux/unbundle/absl_status.gn 5648 index 190548581..988000b1e 100644 5649 --- a/linux/unbundle/absl_status.gn 5650 +++ b/linux/unbundle/absl_status.gn 5651 @@ -1,5 +1,5 @@ 5652 -import("//build/config/linux/pkg_config.gni") 5653 -import("//build/shim_headers.gni") 5654 +import("//chromium/build/config/linux/pkg_config.gni") 5655 +import("//chromium/build/shim_headers.gni") 5656 5657 pkg_config("system_absl_status") { 5658 packages = [ "absl_status" ] 5659 diff --git a/linux/unbundle/absl_strings.gn b/linux/unbundle/absl_strings.gn 5660 index d91d84fc5..f6cc72608 100644 5661 --- a/linux/unbundle/absl_strings.gn 5662 +++ b/linux/unbundle/absl_strings.gn 5663 @@ -1,5 +1,5 @@ 5664 -import("//build/config/linux/pkg_config.gni") 5665 -import("//build/shim_headers.gni") 5666 +import("//chromium/build/config/linux/pkg_config.gni") 5667 +import("//chromium/build/shim_headers.gni") 5668 5669 pkg_config("system_absl_cord") { 5670 packages = [ "absl_cord" ] 5671 diff --git a/linux/unbundle/absl_synchronization.gn b/linux/unbundle/absl_synchronization.gn 5672 index 476d24279..bc2cd0ac7 100644 5673 --- a/linux/unbundle/absl_synchronization.gn 5674 +++ b/linux/unbundle/absl_synchronization.gn 5675 @@ -1,5 +1,5 @@ 5676 -import("//build/config/linux/pkg_config.gni") 5677 -import("//build/shim_headers.gni") 5678 +import("//chromium/build/config/linux/pkg_config.gni") 5679 +import("//chromium/build/shim_headers.gni") 5680 5681 pkg_config("system_absl_synchronization") { 5682 packages = [ "absl_synchronization" ] 5683 diff --git a/linux/unbundle/absl_time.gn b/linux/unbundle/absl_time.gn 5684 index d925cae8e..68641413c 100644 5685 --- a/linux/unbundle/absl_time.gn 5686 +++ b/linux/unbundle/absl_time.gn 5687 @@ -1,5 +1,5 @@ 5688 -import("//build/config/linux/pkg_config.gni") 5689 -import("//build/shim_headers.gni") 5690 +import("//chromium/build/config/linux/pkg_config.gni") 5691 +import("//chromium/build/shim_headers.gni") 5692 5693 pkg_config("system_absl_time") { 5694 packages = [ "absl_time" ] 5695 diff --git a/linux/unbundle/absl_types.gn b/linux/unbundle/absl_types.gn 5696 index 8d2b13145..62440a2b4 100644 5697 --- a/linux/unbundle/absl_types.gn 5698 +++ b/linux/unbundle/absl_types.gn 5699 @@ -1,5 +1,5 @@ 5700 -import("//build/config/linux/pkg_config.gni") 5701 -import("//build/shim_headers.gni") 5702 +import("//chromium/build/config/linux/pkg_config.gni") 5703 +import("//chromium/build/shim_headers.gni") 5704 5705 pkg_config("system_absl_any") { 5706 packages = [ "absl_any" ] 5707 diff --git a/linux/unbundle/absl_utility.gn b/linux/unbundle/absl_utility.gn 5708 index ff2b0dd8d..549d3c7b9 100644 5709 --- a/linux/unbundle/absl_utility.gn 5710 +++ b/linux/unbundle/absl_utility.gn 5711 @@ -1,5 +1,5 @@ 5712 -import("//build/config/linux/pkg_config.gni") 5713 -import("//build/shim_headers.gni") 5714 +import("//chromium/build/config/linux/pkg_config.gni") 5715 +import("//chromium/build/shim_headers.gni") 5716 5717 pkg_config("system_absl_utility") { 5718 packages = [ "absl_utility" ] 5719 diff --git a/linux/unbundle/brotli.gn b/linux/unbundle/brotli.gn 5720 index 8e43b4e53..3313335e3 100644 5721 --- a/linux/unbundle/brotli.gn 5722 +++ b/linux/unbundle/brotli.gn 5723 @@ -1,5 +1,5 @@ 5724 -import("//build/config/linux/pkg_config.gni") 5725 -import("//build/shim_headers.gni") 5726 +import("//chromium/build/config/linux/pkg_config.gni") 5727 +import("//chromium/build/shim_headers.gni") 5728 5729 pkg_config("system_brotli_dec") { 5730 packages = [ "libbrotlidec" ] 5731 diff --git a/linux/unbundle/crc32c.gn b/linux/unbundle/crc32c.gn 5732 index 23f2292d9..36a7b9d8c 100644 5733 --- a/linux/unbundle/crc32c.gn 5734 +++ b/linux/unbundle/crc32c.gn 5735 @@ -1,4 +1,4 @@ 5736 -import("//build/shim_headers.gni") 5737 +import("//chromium/build/shim_headers.gni") 5738 5739 shim_headers("crc32c_shim") { 5740 root_path = "src/include" 5741 diff --git a/linux/unbundle/dav1d.gn b/linux/unbundle/dav1d.gn 5742 index a6d005a66..8b57f4216 100644 5743 --- a/linux/unbundle/dav1d.gn 5744 +++ b/linux/unbundle/dav1d.gn 5745 @@ -1,5 +1,5 @@ 5746 -import("//build/config/linux/pkg_config.gni") 5747 -import("//build/shim_headers.gni") 5748 +import("//chromium/build/config/linux/pkg_config.gni") 5749 +import("//chromium/build/shim_headers.gni") 5750 5751 pkg_config("system_dav1d") { 5752 packages = [ "dav1d" ] 5753 diff --git a/linux/unbundle/double-conversion.gn b/linux/unbundle/double-conversion.gn 5754 index 8f970c5a2..6feda2a2e 100644 5755 --- a/linux/unbundle/double-conversion.gn 5756 +++ b/linux/unbundle/double-conversion.gn 5757 @@ -1,4 +1,4 @@ 5758 -import("//build/shim_headers.gni") 5759 +import("//chromium/build/shim_headers.gni") 5760 5761 shim_headers("double_conversion_shim") { 5762 root_path = "." 5763 diff --git a/linux/unbundle/ffmpeg.gn b/linux/unbundle/ffmpeg.gn 5764 index 0008275da..6e1f58a20 100644 5765 --- a/linux/unbundle/ffmpeg.gn 5766 +++ b/linux/unbundle/ffmpeg.gn 5767 @@ -2,9 +2,9 @@ 5768 # Use of this source code is governed by a BSD-style license that can be 5769 # found in the LICENSE file. 5770 5771 -import("//build/buildflag_header.gni") 5772 -import("//build/config/linux/pkg_config.gni") 5773 -import("//build/shim_headers.gni") 5774 +import("//chromium/build/buildflag_header.gni") 5775 +import("//chromium/build/config/linux/pkg_config.gni") 5776 +import("//chromium/build/shim_headers.gni") 5777 5778 pkg_config("system_ffmpeg") { 5779 packages = [ 5780 diff --git a/linux/unbundle/flac.gn b/linux/unbundle/flac.gn 5781 index ce9a1b377..6b01855b9 100644 5782 --- a/linux/unbundle/flac.gn 5783 +++ b/linux/unbundle/flac.gn 5784 @@ -2,8 +2,8 @@ 5785 # Use of this source code is governed by a BSD-style license that can be 5786 # found in the LICENSE file. 5787 5788 -import("//build/config/linux/pkg_config.gni") 5789 -import("//build/shim_headers.gni") 5790 +import("//chromium/build/config/linux/pkg_config.gni") 5791 +import("//chromium/build/shim_headers.gni") 5792 5793 pkg_config("system_flac") { 5794 packages = [ "flac" ] 5795 diff --git a/linux/unbundle/flatbuffers.gn b/linux/unbundle/flatbuffers.gn 5796 index 7132f6c33..c79d2a409 100644 5797 --- a/linux/unbundle/flatbuffers.gn 5798 +++ b/linux/unbundle/flatbuffers.gn 5799 @@ -1,4 +1,4 @@ 5800 -import("//build/shim_headers.gni") 5801 +import("//chromium/build/shim_headers.gni") 5802 5803 config("flatbuffers_config") { 5804 include_dirs = [ "src/include" ] 5805 diff --git a/linux/unbundle/highway.gn b/linux/unbundle/highway.gn 5806 index ac7e743f7..dbdef1de6 100644 5807 --- a/linux/unbundle/highway.gn 5808 +++ b/linux/unbundle/highway.gn 5809 @@ -1,5 +1,5 @@ 5810 -import("//build/config/linux/pkg_config.gni") 5811 -import("//build/shim_headers.gni") 5812 +import("//chromium/build/config/linux/pkg_config.gni") 5813 +import("//chromium/build/shim_headers.gni") 5814 import("src/hwy.gni") 5815 5816 pkg_config("libhwy_external_config") { 5817 diff --git a/linux/unbundle/icu.gn b/linux/unbundle/icu.gn 5818 index bad83cda0..768d42e4c 100644 5819 --- a/linux/unbundle/icu.gn 5820 +++ b/linux/unbundle/icu.gn 5821 @@ -2,8 +2,8 @@ 5822 # Use of this source code is governed by a BSD-style license that can be 5823 # found in the LICENSE file. 5824 5825 -import("//build/config/linux/pkg_config.gni") 5826 -import("//build/shim_headers.gni") 5827 +import("//chromium/build/config/linux/pkg_config.gni") 5828 +import("//chromium/build/shim_headers.gni") 5829 5830 group("icu") { 5831 public_deps = [ 5832 diff --git a/linux/unbundle/jsoncpp.gn b/linux/unbundle/jsoncpp.gn 5833 index e84a0ef27..f29647607 100644 5834 --- a/linux/unbundle/jsoncpp.gn 5835 +++ b/linux/unbundle/jsoncpp.gn 5836 @@ -1,5 +1,5 @@ 5837 -import("//build/config/linux/pkg_config.gni") 5838 -import("//build/shim_headers.gni") 5839 +import("//chromium/build/config/linux/pkg_config.gni") 5840 +import("//chromium/build/shim_headers.gni") 5841 5842 pkg_config("jsoncpp_config") { 5843 packages = [ "jsoncpp" ] 5844 diff --git a/linux/unbundle/libXNVCtrl.gn b/linux/unbundle/libXNVCtrl.gn 5845 index 0e1265b8c..befa168c6 100644 5846 --- a/linux/unbundle/libXNVCtrl.gn 5847 +++ b/linux/unbundle/libXNVCtrl.gn 5848 @@ -1,4 +1,4 @@ 5849 -import("//build/shim_headers.gni") 5850 +import("//chromium/build/shim_headers.gni") 5851 5852 shim_headers("libXNVCtrl_shim") { 5853 root_path = "../../../../../third_party/libXNVCtrl" 5854 diff --git a/linux/unbundle/libaom.gn b/linux/unbundle/libaom.gn 5855 index dab8dfaba..e5420d6e9 100644 5856 --- a/linux/unbundle/libaom.gn 5857 +++ b/linux/unbundle/libaom.gn 5858 @@ -1,6 +1,6 @@ 5859 -import("//build/buildflag_header.gni") 5860 -import("//build/config/linux/pkg_config.gni") 5861 -import("//build/shim_headers.gni") 5862 +import("//chromium/build/buildflag_header.gni") 5863 +import("//chromium/build/config/linux/pkg_config.gni") 5864 +import("//chromium/build/shim_headers.gni") 5865 import("//third_party/libaom/options.gni") 5866 5867 buildflag_header("libaom_buildflags") { 5868 diff --git a/linux/unbundle/libavif.gn b/linux/unbundle/libavif.gn 5869 index c79f95ba4..d81db3d8f 100644 5870 --- a/linux/unbundle/libavif.gn 5871 +++ b/linux/unbundle/libavif.gn 5872 @@ -1,5 +1,5 @@ 5873 -import("//build/config/linux/pkg_config.gni") 5874 -import("//build/shim_headers.gni") 5875 +import("//chromium/build/config/linux/pkg_config.gni") 5876 +import("//chromium/build/shim_headers.gni") 5877 5878 pkg_config("system_libavif") { 5879 packages = [ "libavif" ] 5880 diff --git a/linux/unbundle/libdrm.gn b/linux/unbundle/libdrm.gn 5881 index d461b8ca5..1bd6e85c8 100644 5882 --- a/linux/unbundle/libdrm.gn 5883 +++ b/linux/unbundle/libdrm.gn 5884 @@ -2,8 +2,8 @@ 5885 # Use of this source code is governed by a BSD-style license that can be 5886 # found in the LICENSE file. 5887 5888 -import("//build/config/linux/pkg_config.gni") 5889 -import("//build/shim_headers.gni") 5890 +import("//chromium/build/config/linux/pkg_config.gni") 5891 +import("//chromium/build/shim_headers.gni") 5892 5893 pkg_config("system_libdrm") { 5894 packages = [ "libdrm" ] 5895 diff --git a/linux/unbundle/libpng.gn b/linux/unbundle/libpng.gn 5896 index 91e0ee45d..16e54b545 100644 5897 --- a/linux/unbundle/libpng.gn 5898 +++ b/linux/unbundle/libpng.gn 5899 @@ -2,8 +2,8 @@ 5900 # Use of this source code is governed by a BSD-style license that can be 5901 # found in the LICENSE file. 5902 5903 -import("//build/config/linux/pkg_config.gni") 5904 -import("//build/shim_headers.gni") 5905 +import("//chromium/build/config/linux/pkg_config.gni") 5906 +import("//chromium/build/shim_headers.gni") 5907 5908 pkg_config("libpng_config") { 5909 packages = [ "libpng" ] 5910 diff --git a/linux/unbundle/libsecret.gn b/linux/unbundle/libsecret.gn 5911 index 4cfd2f0d7..3fd2972d6 100644 5912 --- a/linux/unbundle/libsecret.gn 5913 +++ b/linux/unbundle/libsecret.gn 5914 @@ -1,4 +1,4 @@ 5915 -import("//build/config/linux/pkg_config.gni") 5916 +import("//chromium/build/config/linux/pkg_config.gni") 5917 5918 pkg_config("libsecret_config") { 5919 packages = [ "libsecret-1" ] 5920 diff --git a/linux/unbundle/libusb.gn b/linux/unbundle/libusb.gn 5921 index 3d15851ab..410ac36d8 100644 5922 --- a/linux/unbundle/libusb.gn 5923 +++ b/linux/unbundle/libusb.gn 5924 @@ -1,5 +1,5 @@ 5925 -import("//build/config/linux/pkg_config.gni") 5926 -import("//build/shim_headers.gni") 5927 +import("//chromium/build/config/linux/pkg_config.gni") 5928 +import("//chromium/build/shim_headers.gni") 5929 5930 pkg_config("system_libusb") { 5931 packages = [ "libusb-1.0" ] 5932 diff --git a/linux/unbundle/libvpx.gn b/linux/unbundle/libvpx.gn 5933 index 8b7bb5e7c..d22d20204 100644 5934 --- a/linux/unbundle/libvpx.gn 5935 +++ b/linux/unbundle/libvpx.gn 5936 @@ -2,8 +2,8 @@ 5937 # Use of this source code is governed by a BSD-style license that can be 5938 # found in the LICENSE file. 5939 5940 -import("//build/config/linux/pkg_config.gni") 5941 -import("//build/shim_headers.gni") 5942 +import("//chromium/build/config/linux/pkg_config.gni") 5943 +import("//chromium/build/shim_headers.gni") 5944 5945 pkg_config("system_libvpx") { 5946 packages = [ "vpx" ] 5947 diff --git a/linux/unbundle/libwebp.gn b/linux/unbundle/libwebp.gn 5948 index 50c618229..e7da862c4 100644 5949 --- a/linux/unbundle/libwebp.gn 5950 +++ b/linux/unbundle/libwebp.gn 5951 @@ -2,8 +2,8 @@ 5952 # Use of this source code is governed by a BSD-style license that can be 5953 # found in the LICENSE file. 5954 5955 -import("//build/config/linux/pkg_config.gni") 5956 -import("//build/shim_headers.gni") 5957 +import("//chromium/build/config/linux/pkg_config.gni") 5958 +import("//chromium/build/shim_headers.gni") 5959 5960 pkg_config("system_libwebp") { 5961 packages = [ 5962 diff --git a/linux/unbundle/libxml.gn b/linux/unbundle/libxml.gn 5963 index 8567c154f..0f8d9adb6 100644 5964 --- a/linux/unbundle/libxml.gn 5965 +++ b/linux/unbundle/libxml.gn 5966 @@ -2,7 +2,7 @@ 5967 # Use of this source code is governed by a BSD-style license that can be 5968 # found in the LICENSE file. 5969 5970 -import("//build/config/linux/pkg_config.gni") 5971 +import("//chromium/build/config/linux/pkg_config.gni") 5972 5973 pkg_config("system_libxml") { 5974 packages = [ "libxml-2.0" ] 5975 diff --git a/linux/unbundle/libxslt.gn b/linux/unbundle/libxslt.gn 5976 index 787796063..3702f227a 100644 5977 --- a/linux/unbundle/libxslt.gn 5978 +++ b/linux/unbundle/libxslt.gn 5979 @@ -2,7 +2,7 @@ 5980 # Use of this source code is governed by a BSD-style license that can be 5981 # found in the LICENSE file. 5982 5983 -import("//build/config/linux/pkg_config.gni") 5984 +import("//chromium/build/config/linux/pkg_config.gni") 5985 5986 pkg_config("system_libxslt") { 5987 packages = [ "libxslt" ] 5988 diff --git a/linux/unbundle/libyuv.gn b/linux/unbundle/libyuv.gn 5989 index 116131ee4..69cccffcf 100644 5990 --- a/linux/unbundle/libyuv.gn 5991 +++ b/linux/unbundle/libyuv.gn 5992 @@ -1,5 +1,5 @@ 5993 -import("//build/config/linux/pkg_config.gni") 5994 -import("//build/shim_headers.gni") 5995 +import("//chromium/build/config/linux/pkg_config.gni") 5996 +import("//chromium/build/shim_headers.gni") 5997 5998 pkg_config("libyuv_config") { 5999 packages = [ "libyuv" ] 6000 diff --git a/linux/unbundle/openh264.gn b/linux/unbundle/openh264.gn 6001 index 90d14aa91..e81cbc00f 100644 6002 --- a/linux/unbundle/openh264.gn 6003 +++ b/linux/unbundle/openh264.gn 6004 @@ -2,14 +2,14 @@ 6005 # Use of this source code is governed by a BSD-style license that can be 6006 # found in the LICENSE file. 6007 6008 -import("//build/config/linux/pkg_config.gni") 6009 -import("//build/shim_headers.gni") 6010 +import("//chromium/build/config/linux/pkg_config.gni") 6011 +import("//chromium/build/shim_headers.gni") 6012 6013 config("encoder_cfi_flags") { 6014 cflags = [] 6015 if (current_toolchain == default_toolchain && is_clang) { 6016 openh264_cfi_ignorelist_path = 6017 - rebase_path("//build/linux/unbundle/openh264_encoder_cfi_ignores.txt", 6018 + rebase_path("//chromium/build/linux/unbundle/openh264_encoder_cfi_ignores.txt", 6019 root_build_dir) 6020 cflags += [ "-fsanitize-ignorelist=$openh264_cfi_ignorelist_path" ] 6021 } 6022 diff --git a/linux/unbundle/opus.gn b/linux/unbundle/opus.gn 6023 index b1a199a53..81dc4d09d 100644 6024 --- a/linux/unbundle/opus.gn 6025 +++ b/linux/unbundle/opus.gn 6026 @@ -2,8 +2,8 @@ 6027 # Use of this source code is governed by a BSD-style license that can be 6028 # found in the LICENSE file. 6029 6030 -import("//build/config/linux/pkg_config.gni") 6031 -import("//build/shim_headers.gni") 6032 +import("//chromium/build/config/linux/pkg_config.gni") 6033 +import("//chromium/build/shim_headers.gni") 6034 6035 pkg_config("opus_config") { 6036 packages = [ "opus" ] 6037 diff --git a/linux/unbundle/re2.gn b/linux/unbundle/re2.gn 6038 index d587619d0..3478afcf2 100644 6039 --- a/linux/unbundle/re2.gn 6040 +++ b/linux/unbundle/re2.gn 6041 @@ -2,9 +2,9 @@ 6042 # Use of this source code is governed by a BSD-style license that can be 6043 # found in the LICENSE file. 6044 6045 -import("//build/config/c++/c++.gni") 6046 -import("//build/config/linux/pkg_config.gni") 6047 -import("//build/shim_headers.gni") 6048 +import("//chromium/build/config/c++/c++.gni") 6049 +import("//chromium/build/config/linux/pkg_config.gni") 6050 +import("//chromium/build/shim_headers.gni") 6051 6052 assert(!use_custom_libcxx, 6053 "Usage of the system libre2.so is not supported with " + 6054 diff --git a/linux/unbundle/simdutf.gn b/linux/unbundle/simdutf.gn 6055 index 67d86cb3b..062c0c1e1 100644 6056 --- a/linux/unbundle/simdutf.gn 6057 +++ b/linux/unbundle/simdutf.gn 6058 @@ -2,8 +2,8 @@ 6059 # Use of this source code is governed by a BSD-style license that can be 6060 # found in the LICENSE file. 6061 6062 -import("//build/config/linux/pkg_config.gni") 6063 -import("//build/shim_headers.gni") 6064 +import("//chromium/build/config/linux/pkg_config.gni") 6065 +import("//chromium/build/shim_headers.gni") 6066 6067 shim_headers("header") { 6068 root_path = "." 6069 diff --git a/linux/unbundle/snappy.gn b/linux/unbundle/snappy.gn 6070 index dea0b5543..e8087d118 100644 6071 --- a/linux/unbundle/snappy.gn 6072 +++ b/linux/unbundle/snappy.gn 6073 @@ -2,7 +2,7 @@ 6074 # Use of this source code is governed by a BSD-style license that can be 6075 # found in the LICENSE file. 6076 6077 -import("//build/shim_headers.gni") 6078 +import("//chromium/build/shim_headers.gni") 6079 6080 shim_headers("snappy_shim") { 6081 root_path = "src" 6082 diff --git a/linux/unbundle/swiftshader-SPIRV-Headers.gn b/linux/unbundle/swiftshader-SPIRV-Headers.gn 6083 index 24f79de1e..b002abd6e 100644 6084 --- a/linux/unbundle/swiftshader-SPIRV-Headers.gn 6085 +++ b/linux/unbundle/swiftshader-SPIRV-Headers.gn 6086 @@ -1,4 +1,4 @@ 6087 -import("//build/shim_headers.gni") 6088 +import("//chromium/build/shim_headers.gni") 6089 6090 shim_headers("SPIRV-Headers_shim") { 6091 root_path = "../../../../third_party/SPIRV-Headers/include" 6092 diff --git a/linux/unbundle/swiftshader-SPIRV-Tools.gn b/linux/unbundle/swiftshader-SPIRV-Tools.gn 6093 index eb9d9224e..e79807cfd 100644 6094 --- a/linux/unbundle/swiftshader-SPIRV-Tools.gn 6095 +++ b/linux/unbundle/swiftshader-SPIRV-Tools.gn 6096 @@ -1,5 +1,5 @@ 6097 -import("//build/config/linux/pkg_config.gni") 6098 -import("//build/shim_headers.gni") 6099 +import("//chromium/build/config/linux/pkg_config.gni") 6100 +import("//chromium/build/shim_headers.gni") 6101 6102 pkg_config("system_SPIRV-Tools") { 6103 packages = [ "SPIRV-Tools" ] 6104 diff --git a/linux/unbundle/vulkan-SPIRV-Headers.gn b/linux/unbundle/vulkan-SPIRV-Headers.gn 6105 index eb2495ce2..0d5e2f2f5 100644 6106 --- a/linux/unbundle/vulkan-SPIRV-Headers.gn 6107 +++ b/linux/unbundle/vulkan-SPIRV-Headers.gn 6108 @@ -1,6 +1,6 @@ 6109 # This shim can only be used if you build Chromium without DAWN 6110 6111 -import("//build/shim_headers.gni") 6112 +import("//chromium/build/shim_headers.gni") 6113 6114 shim_headers("vulkan-SPIRV-Headers_shim") { 6115 root_path = "include" 6116 diff --git a/linux/unbundle/vulkan-SPIRV-Tools.gn b/linux/unbundle/vulkan-SPIRV-Tools.gn 6117 index a65c64c61..30bfbf539 100644 6118 --- a/linux/unbundle/vulkan-SPIRV-Tools.gn 6119 +++ b/linux/unbundle/vulkan-SPIRV-Tools.gn 6120 @@ -1,7 +1,7 @@ 6121 # This shim can only be used if you build Chromium without DAWN 6122 6123 -import("//build/config/linux/pkg_config.gni") 6124 -import("//build/shim_headers.gni") 6125 +import("//chromium/build/config/linux/pkg_config.gni") 6126 +import("//chromium/build/shim_headers.gni") 6127 6128 pkg_config("spvtools_internal_config") { 6129 packages = [ "SPIRV-Tools" ] 6130 diff --git a/linux/unbundle/woff2.gn b/linux/unbundle/woff2.gn 6131 index e7bae10fd..984719498 100644 6132 --- a/linux/unbundle/woff2.gn 6133 +++ b/linux/unbundle/woff2.gn 6134 @@ -1,5 +1,5 @@ 6135 -import("//build/config/linux/pkg_config.gni") 6136 -import("//build/shim_headers.gni") 6137 +import("//chromium/build/config/linux/pkg_config.gni") 6138 +import("//chromium/build/shim_headers.gni") 6139 6140 pkg_config("system_woff2") { 6141 packages = [ "libwoff2dec" ] 6142 diff --git a/linux/unbundle/zlib.gn b/linux/unbundle/zlib.gn 6143 index 736d60958..bbcdd6e94 100644 6144 --- a/linux/unbundle/zlib.gn 6145 +++ b/linux/unbundle/zlib.gn 6146 @@ -2,7 +2,7 @@ 6147 # Use of this source code is governed by a BSD-style license that can be 6148 # found in the LICENSE file. 6149 6150 -import("//build/shim_headers.gni") 6151 +import("//chromium/build/shim_headers.gni") 6152 6153 shim_headers("zlib_shim") { 6154 root_path = "." 6155 diff --git a/linux/unbundle/zstd.gn b/linux/unbundle/zstd.gn 6156 index 1a5dac6d4..f70a6e4d8 100644 6157 --- a/linux/unbundle/zstd.gn 6158 +++ b/linux/unbundle/zstd.gn 6159 @@ -2,8 +2,8 @@ 6160 # Use of this source code is governed by a BSD-style license that can be 6161 # found in the LICENSE file. 6162 6163 -import("//build/config/linux/pkg_config.gni") 6164 -import("//build/shim_headers.gni") 6165 +import("//chromium/build/config/linux/pkg_config.gni") 6166 +import("//chromium/build/shim_headers.gni") 6167 6168 pkg_config("system_zstd") { 6169 packages = [ "libzstd" ] 6170 diff --git a/nocompile.gni b/nocompile.gni 6171 index 2d9991bee..63c949b20 100644 6172 --- a/nocompile.gni 6173 +++ b/nocompile.gni 6174 @@ -10,7 +10,7 @@ 6175 # 6176 # 1. Create a GN target: 6177 # 6178 -# import("//build/nocompile.gni") 6179 +# import("//chromium/build/nocompile.gni") 6180 # 6181 # nocompile_source_set("base_nocompile_tests") { 6182 # sources = [ 6183 @@ -49,9 +49,9 @@ 6184 # Also see: 6185 # http://dev.chromium.org/developers/testing/no-compile-tests 6186 # 6187 -import("//build/config/clang/clang.gni") 6188 +import("//chromium/build/config/clang/clang.gni") 6189 if (is_win) { 6190 - import("//build/toolchain/win/win_toolchain_data.gni") 6191 + import("//chromium/build/toolchain/win/win_toolchain_data.gni") 6192 } 6193 6194 declare_args() { 6195 @@ -78,7 +78,7 @@ if (enable_nocompile_tests) { 6196 6197 # Disable the checks that the Chrome style plugin normally enforces to 6198 # reduce the amount of boilerplate needed in nocompile tests. 6199 - configs -= [ "//build/config/clang:find_bad_constructs" ] 6200 + configs -= [ "//chromium/build/config/clang:find_bad_constructs" ] 6201 6202 if (is_win) { 6203 result_path = 6204 diff --git a/partitioned_shared_library.gni b/partitioned_shared_library.gni 6205 index 18b5917a7..7bd0b89d9 100644 6206 --- a/partitioned_shared_library.gni 6207 +++ b/partitioned_shared_library.gni 6208 @@ -3,9 +3,9 @@ 6209 # Use of this source code is governed by a BSD-style license that can be 6210 # found in the LICENSE file. 6211 6212 -import("//build/config/android/config.gni") 6213 -import("//build/config/clang/clang.gni") 6214 -import("//build/config/compiler/compiler.gni") 6215 +import("//chromium/build/config/android/config.gni") 6216 +import("//chromium/build/config/clang/clang.gni") 6217 +import("//chromium/build/config/compiler/compiler.gni") 6218 if (build_with_chromium) { 6219 import("//third_party/jni_zero/jni_zero.gni") 6220 } 6221 @@ -77,7 +77,7 @@ template("partitioned_shared_library") { 6222 template("partition_action") { 6223 action(target_name) { 6224 deps = [ ":$_combined_library_target" ] 6225 - script = "//build/extract_partition.py" 6226 + script = "//chromium/build/extract_partition.py" 6227 sources = 6228 [ "$root_out_dir/lib.unstripped/lib${_output_name}__combined.so" ] 6229 outputs = [ 6230 @@ -151,7 +151,7 @@ template("partitioned_shared_library_with_jni") { 6231 forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY) 6232 forward_variables_from(invoker, TESTONLY_AND_VISIBILITY) 6233 target_type = "partitioned_shared_library" 6234 - target_type_import = "//build/partitioned_shared_library.gni" 6235 + target_type_import = "//chromium/build/partitioned_shared_library.gni" 6236 } 6237 } 6238 set_defaults("partitioned_shared_library_with_jni") { 6239 diff --git a/private_code_test/BUILD.gn b/private_code_test/BUILD.gn 6240 index 1e65d98bd..4034662db 100644 6241 --- a/private_code_test/BUILD.gn 6242 +++ b/private_code_test/BUILD.gn 6243 @@ -2,7 +2,7 @@ 6244 # Use of this source code is governed by a BSD-style license that can be 6245 # found in the LICENSE file. 6246 6247 -import("//build/config/python.gni") 6248 +import("//chromium/build/config/python.gni") 6249 import("//build_overrides/build.gni") 6250 import("private_code_test.gni") 6251 6252 diff --git a/private_code_test/private_code_test.gni b/private_code_test/private_code_test.gni 6253 index 09d6a8dca..943cb9699 100644 6254 --- a/private_code_test/private_code_test.gni 6255 +++ b/private_code_test/private_code_test.gni 6256 @@ -29,9 +29,9 @@ template("private_code_test") { 6257 _collect_sources_output = "$target_gen_dir/$target_name.json" 6258 _collect_sources_target_name = "${target_name}__parse_ninja" 6259 action(_collect_sources_target_name) { 6260 - script = "//build/private_code_test/ninja_parser.py" 6261 + script = "//chromium/build/private_code_test/ninja_parser.py" 6262 outputs = [ _collect_sources_output ] 6263 - inputs = [ "//build/action_helpers.py" ] 6264 + inputs = [ "//chromium/build/action_helpers.py" ] 6265 depfile = "$target_gen_dir/$target_name.d" 6266 6267 # The script does not read this file, so the dep is not really required. 6268 @@ -51,13 +51,13 @@ template("private_code_test") { 6269 } 6270 6271 isolated_script_test(target_name) { 6272 - script = "//build/private_code_test/private_code_test.py" 6273 + script = "//chromium/build/private_code_test/private_code_test.py" 6274 if (defined(invoker.private_paths_dep)) { 6275 _private_paths_dep = invoker.private_paths_dep 6276 _private_paths_file = invoker.private_paths_file 6277 } else { 6278 _private_paths_dep = 6279 - "//build/private_code_test:private_paths($default_toolchain)" 6280 + "//chromium/build/private_code_test:private_paths($default_toolchain)" 6281 _private_paths_file = 6282 get_label_info(_private_paths_dep, "target_gen_dir") + 6283 "/private_paths.txt" 6284 diff --git a/rust/BUILD.gn b/rust/BUILD.gn 6285 index c2920d46d..a17812bda 100644 6286 --- a/rust/BUILD.gn 6287 +++ b/rust/BUILD.gn 6288 @@ -2,7 +2,7 @@ 6289 # Use of this source code is governed by a BSD-style license that can be 6290 # found in the LICENSE file. 6291 6292 -import("//build/config/rust.gni") 6293 +import("//chromium/build/config/rust.gni") 6294 6295 if (toolchain_has_rust) { 6296 config("edition_2024") { 6297 @@ -89,7 +89,7 @@ config("forbid_unsafe") { 6298 } 6299 6300 config("panic_immediate_abort") { 6301 - visibility = [ "//build/rust/std/rules:*" ] 6302 + visibility = [ "//chromium/build/rust/std/rules:*" ] 6303 if (is_official_build) { 6304 rustflags = [ 6305 "--cfg", 6306 diff --git a/rust/cargo_crate.gni b/rust/cargo_crate.gni 6307 index 6d11c538b..6e221c95d 100644 6308 --- a/rust/cargo_crate.gni 6309 +++ b/rust/cargo_crate.gni 6310 @@ -2,9 +2,9 @@ 6311 # Use of this source code is governed by a BSD-style license that can be 6312 # found in the LICENSE file. 6313 6314 -import("//build/rust/rust_executable.gni") 6315 -import("//build/rust/rust_macro.gni") 6316 -import("//build/rust/rust_static_library.gni") 6317 +import("//chromium/build/rust/rust_executable.gni") 6318 +import("//chromium/build/rust/rust_macro.gni") 6319 +import("//chromium/build/rust/rust_static_library.gni") 6320 6321 # This template allows for building Cargo crates within gn. 6322 # 6323 @@ -363,7 +363,7 @@ template("cargo_crate") { 6324 action("${_build_script_name}_write_rustflags") { 6325 _rustflags_txt = "$_build_script_env_out_dir/rustflags.txt" 6326 outputs = [ _rustflags_txt ] 6327 - script = rebase_path("//build/rust/write_rustflags.py") 6328 + script = rebase_path("//chromium/build/rust/write_rustflags.py") 6329 args = [ 6330 "--output", 6331 rebase_path(_rustflags_txt, root_build_dir), 6332 @@ -382,13 +382,13 @@ template("cargo_crate") { 6333 6334 # Extra targets required to make build script work 6335 action("${_build_script_name}_output") { 6336 - script = rebase_path("//build/rust/run_build_script.py") 6337 + script = rebase_path("//chromium/build/rust/run_build_script.py") 6338 _write_rustflags_outputs = 6339 get_target_outputs(":${_build_script_name}_write_rustflags") 6340 _rustflags_txt = _write_rustflags_outputs[0] 6341 inputs = [ 6342 - "//build/action_helpers.py", 6343 - "//build/gn_helpers.py", 6344 + "//chromium/build/action_helpers.py", 6345 + "//chromium/build/gn_helpers.py", 6346 _rustflags_txt, 6347 ] 6348 build_script_target = ":${_build_script_name}($rust_macro_toolchain)" 6349 @@ -499,7 +499,7 @@ template("cargo_crate") { 6350 "rustflags", 6351 ]) 6352 configs -= [ 6353 - "//build/config/compiler:chromium_code", 6354 + "//chromium/build/config/compiler:chromium_code", 6355 6356 # Avoid generating profiling data for build scripts. 6357 # 6358 @@ -511,9 +511,9 @@ template("cargo_crate") { 6359 # If we do include build script output in test metrics, it could be 6360 # misleading: exercising some code from a build script doesn't give us 6361 # the same signal as an actual test. 6362 - "//build/config/coverage:default_coverage", 6363 + "//chromium/build/config/coverage:default_coverage", 6364 ] 6365 - configs += [ "//build/config/compiler:no_chromium_code" ] 6366 + configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6367 } 6368 } else { 6369 not_needed(invoker, 6370 diff --git a/rust/chromium_prelude/BUILD.gn b/rust/chromium_prelude/BUILD.gn 6371 index 28e9a0abe..602549f37 100644 6372 --- a/rust/chromium_prelude/BUILD.gn 6373 +++ b/rust/chromium_prelude/BUILD.gn 6374 @@ -2,9 +2,9 @@ 6375 # Use of this source code is governed by a BSD-style license that can be 6376 # found in the LICENSE file. 6377 6378 -import("//build/rust/rust_executable.gni") 6379 -import("//build/rust/rust_macro.gni") 6380 -import("//build/rust/rust_static_library.gni") 6381 +import("//chromium/build/rust/rust_executable.gni") 6382 +import("//chromium/build/rust/rust_macro.gni") 6383 +import("//chromium/build/rust/rust_static_library.gni") 6384 6385 if (enable_chromium_prelude) { 6386 rust_static_library("chromium_prelude") { 6387 diff --git a/rust/chromium_prelude/import_test.rs b/rust/chromium_prelude/import_test.rs 6388 index a8ddcf428..2da9b3d53 100644 6389 --- a/rust/chromium_prelude/import_test.rs 6390 +++ b/rust/chromium_prelude/import_test.rs 6391 @@ -4,7 +4,7 @@ 6392 6393 mod test_direct { 6394 chromium::import! { 6395 - "//build/rust/chromium_prelude:import_test_lib"; 6396 + "//chromium/build/rust/chromium_prelude:import_test_lib"; 6397 } 6398 6399 pub fn import_test() { 6400 @@ -14,7 +14,7 @@ mod test_direct { 6401 6402 mod test_as { 6403 chromium::import! { 6404 - "//build/rust/chromium_prelude:import_test_lib" as library; 6405 + "//chromium/build/rust/chromium_prelude:import_test_lib" as library; 6406 } 6407 6408 pub fn import_test() { 6409 @@ -24,7 +24,7 @@ mod test_as { 6410 6411 mod test_pub { 6412 chromium::import! { 6413 - pub "//build/rust/chromium_prelude:import_test_lib" as library; 6414 + pub "//chromium/build/rust/chromium_prelude:import_test_lib" as library; 6415 } 6416 } 6417 6418 diff --git a/rust/crubit/BUILD.gn b/rust/crubit/BUILD.gn 6419 index 2bc6eb00e..3f1a3a550 100644 6420 --- a/rust/crubit/BUILD.gn 6421 +++ b/rust/crubit/BUILD.gn 6422 @@ -2,9 +2,9 @@ 6423 # Use of this source code is governed by a BSD-style license that can be 6424 # found in the LICENSE file. 6425 6426 -import("//build/config/rust.gni") 6427 -import("//build/rust/rust_macro.gni") 6428 -import("//build/rust/rust_static_library.gni") 6429 +import("//chromium/build/config/rust.gni") 6430 +import("//chromium/build/rust/rust_macro.gni") 6431 +import("//chromium/build/rust/rust_static_library.gni") 6432 6433 # Common constants. 6434 _support_dir = "{rust_sysroot}/lib/crubit" 6435 diff --git a/rust/rs_bindings_from_cc.gni b/rust/rs_bindings_from_cc.gni 6436 index 54775ea11..8748da7b8 100644 6437 --- a/rust/rs_bindings_from_cc.gni 6438 +++ b/rust/rs_bindings_from_cc.gni 6439 @@ -2,10 +2,10 @@ 6440 # Use of this source code is governed by a BSD-style license that can be 6441 # found in the LICENSE file. 6442 6443 -import("//build/config/clang/clang.gni") 6444 -import("//build/config/rust.gni") 6445 -import("//build/config/sysroot.gni") 6446 -import("//build/rust/mixed_static_library.gni") 6447 +import("//chromium/build/config/clang/clang.gni") 6448 +import("//chromium/build/config/rust.gni") 6449 +import("//chromium/build/config/sysroot.gni") 6450 +import("//chromium/build/rust/mixed_static_library.gni") 6451 6452 # Template to generate and build Rust bindings for a set of C++ headers using 6453 # Crubit's `rs_bindings_from_cc` tool. 6454 @@ -55,8 +55,8 @@ import("//build/rust/mixed_static_library.gni") 6455 # Usage example: 6456 # 6457 # BUILD.gn: 6458 -# import("//build/rust/rs_bindings_from_cc.gni") 6459 -# import("//build/rust/rust_executable.gni") 6460 +# import("//chromium/build/rust/rs_bindings_from_cc.gni") 6461 +# import("//chromium/build/rust/rust_executable.gni") 6462 # 6463 # rust_executable("my_target") { 6464 # crate_root = "main.rs" 6465 @@ -247,7 +247,7 @@ template("rs_bindings_from_cc") { 6466 visibility = _visibility 6467 } 6468 6469 - script = "//build/rust/run_rs_bindings_from_cc.py" 6470 + script = "//chromium/build/rust/run_rs_bindings_from_cc.py" 6471 inputs = [ "//third_party/rust-toolchain/bin/rs_bindings_from_cc" ] 6472 sources = invoker.public_headers 6473 outputs = [ 6474 diff --git a/rust/rust_bindgen.gni b/rust/rust_bindgen.gni 6475 index 5c809c693..16f12ccbb 100644 6476 --- a/rust/rust_bindgen.gni 6477 +++ b/rust/rust_bindgen.gni 6478 @@ -2,14 +2,14 @@ 6479 # Use of this source code is governed by a BSD-style license that can be 6480 # found in the LICENSE file. 6481 6482 -import("//build/config/clang/clang.gni") 6483 -import("//build/config/rust.gni") 6484 -import("//build/config/sysroot.gni") 6485 -import("//build/rust/rust_bindgen_generator.gni") 6486 -import("//build/rust/rust_static_library.gni") 6487 +import("//chromium/build/config/clang/clang.gni") 6488 +import("//chromium/build/config/rust.gni") 6489 +import("//chromium/build/config/sysroot.gni") 6490 +import("//chromium/build/rust/rust_bindgen_generator.gni") 6491 +import("//chromium/build/rust/rust_static_library.gni") 6492 6493 if (is_win) { 6494 - import("//build/toolchain/win/win_toolchain_data.gni") 6495 + import("//chromium/build/toolchain/win/win_toolchain_data.gni") 6496 } 6497 6498 _bindgen_path = "${rust_bindgen_root}/bin/bindgen" 6499 @@ -96,7 +96,7 @@ template("rust_bindgen") { 6500 "cpp", 6501 ]) 6502 6503 - crate_root = "//build/rust/bindings.rs" 6504 + crate_root = "//chromium/build/rust/bindings.rs" 6505 sources = [ crate_root ] 6506 bindgen_deps = [ ":$_rust_bindgen_generator_name" ] 6507 allow_unsafe = true 6508 diff --git a/rust/rust_bindgen_generator.gni b/rust/rust_bindgen_generator.gni 6509 index c91916be9..9ba22a3b6 100644 6510 --- a/rust/rust_bindgen_generator.gni 6511 +++ b/rust/rust_bindgen_generator.gni 6512 @@ -2,13 +2,13 @@ 6513 # Use of this source code is governed by a BSD-style license that can be 6514 # found in the LICENSE file. 6515 6516 -import("//build/config/clang/clang.gni") 6517 -import("//build/config/rust.gni") 6518 -import("//build/config/sysroot.gni") 6519 -import("//build/rust/rust_static_library.gni") 6520 +import("//chromium/build/config/clang/clang.gni") 6521 +import("//chromium/build/config/rust.gni") 6522 +import("//chromium/build/config/sysroot.gni") 6523 +import("//chromium/build/rust/rust_static_library.gni") 6524 6525 if (is_win) { 6526 - import("//build/toolchain/win/win_toolchain_data.gni") 6527 + import("//chromium/build/toolchain/win/win_toolchain_data.gni") 6528 } 6529 6530 _bindgen_path = "${rust_bindgen_root}/bin/bindgen" 6531 @@ -130,12 +130,12 @@ template("rust_bindgen_generator") { 6532 6533 output_file = "$output_dir/${output_name}.rs" 6534 6535 - script = rebase_path("//build/rust/run_bindgen.py") 6536 + script = rebase_path("//chromium/build/rust/run_bindgen.py") 6537 inputs = [ 6538 _bindgen_path, 6539 - "//build/action_helpers.py", 6540 - "//build/gn_helpers.py", 6541 - "//build/rust/filter_clang_args.py", 6542 + "//chromium/build/action_helpers.py", 6543 + "//chromium/build/gn_helpers.py", 6544 + "//chromium/build/rust/filter_clang_args.py", 6545 ] 6546 6547 depfile = "$target_out_dir/${target_name}.d" 6548 diff --git a/rust/rust_executable.gni b/rust/rust_executable.gni 6549 index a1f38fdb2..2d3762f25 100644 6550 --- a/rust/rust_executable.gni 6551 +++ b/rust/rust_executable.gni 6552 @@ -2,7 +2,7 @@ 6553 # Use of this source code is governed by a BSD-style license that can be 6554 # found in the LICENSE file. 6555 6556 -import("//build/rust/rust_target.gni") 6557 +import("//chromium/build/rust/rust_target.gni") 6558 6559 # Defines a Rust executable. 6560 # 6561 diff --git a/rust/rust_macro.gni b/rust/rust_macro.gni 6562 index bcbb30ed4..d8146bf02 100644 6563 --- a/rust/rust_macro.gni 6564 +++ b/rust/rust_macro.gni 6565 @@ -2,8 +2,8 @@ 6566 # Use of this source code is governed by a BSD-style license that can be 6567 # found in the LICENSE file. 6568 6569 -import("//build/config/rust.gni") 6570 -import("//build/rust/rust_target.gni") 6571 +import("//chromium/build/config/rust.gni") 6572 +import("//chromium/build/rust/rust_target.gni") 6573 6574 # Template for generating a Rust proc-macro library. Such targets produce a 6575 # dynamic library that is loaded during compilation and used to generate Rust 6576 diff --git a/rust/rust_shared_library.gni b/rust/rust_shared_library.gni 6577 index e1358c5f2..24ad752ca 100644 6578 --- a/rust/rust_shared_library.gni 6579 +++ b/rust/rust_shared_library.gni 6580 @@ -2,7 +2,7 @@ 6581 # Use of this source code is governed by a BSD-style license that can be 6582 # found in the LICENSE file. 6583 6584 -import("//build/rust/rust_target.gni") 6585 +import("//chromium/build/rust/rust_target.gni") 6586 6587 # Rust dylibs should not be built outside of component builds. Non-component 6588 # builds use build configurations that conflict with the linking of dylibs. 6589 diff --git a/rust/rust_static_library.gni b/rust/rust_static_library.gni 6590 index f60ea6ab6..dc498c196 100644 6591 --- a/rust/rust_static_library.gni 6592 +++ b/rust/rust_static_library.gni 6593 @@ -2,7 +2,7 @@ 6594 # Use of this source code is governed by a BSD-style license that can be 6595 # found in the LICENSE file. 6596 6597 -import("//build/rust/rust_target.gni") 6598 +import("//chromium/build/rust/rust_target.gni") 6599 6600 # Defines a Rust static library which can be used by downstream Rust or C++ 6601 # targets. This is a single Rust compilation unit consisting of potentially 6602 @@ -208,7 +208,7 @@ template("rust_static_library") { 6603 } 6604 } 6605 _all_dependent_configs += [ ":${target_name}_alwayslink" ] 6606 - _configs += [ "//build/rust:is_gtest_unittests" ] 6607 + _configs += [ "//chromium/build/rust:is_gtest_unittests" ] 6608 } 6609 6610 rust_target(_target_name) { 6611 diff --git a/rust/rust_target.gni b/rust/rust_target.gni 6612 index 1a2f96337..c296dd62d 100644 6613 --- a/rust/rust_target.gni 6614 +++ b/rust/rust_target.gni 6615 @@ -2,8 +2,8 @@ 6616 # Use of this source code is governed by a BSD-style license that can be 6617 # found in the LICENSE file. 6618 6619 -import("//build/config/rust.gni") 6620 -import("//build/rust/rust_unit_test.gni") 6621 +import("//chromium/build/config/rust.gni") 6622 +import("//chromium/build/rust/rust_unit_test.gni") 6623 6624 # The //build directory is re-used for non-Chromium projects. Do not support 6625 # cxx bindings in such contexts by default, because //third_party may be 6626 @@ -142,13 +142,13 @@ template("rust_target") { 6627 } 6628 6629 assert(!defined(configs)) 6630 - _configs = [ "//build/rust:edition_${_edition}" ] 6631 + _configs = [ "//chromium/build/rust:edition_${_edition}" ] 6632 _test_configs = [] 6633 if (invoker.target_type == "executable") { 6634 _configs += invoker.executable_configs 6635 } else if (invoker.target_type == "rust_proc_macro") { 6636 _configs += invoker.proc_macro_configs 6637 - _test_configs += [ "//build/rust:proc_macro_extern" ] 6638 + _test_configs += [ "//chromium/build/rust:proc_macro_extern" ] 6639 } else if (invoker.target_type == "shared_library") { 6640 _configs += invoker.shared_library_configs 6641 } else { 6642 @@ -289,11 +289,11 @@ template("rust_target") { 6643 # implementation of these types are provided in the cxx_cppdeps target. 6644 # The C++ targets depending on this Rust target need the headers, while 6645 # the Rust target needs the implementation. 6646 - "//build/rust:cxx_cppdeps", 6647 + "//chromium/build/rust:cxx_cppdeps", 6648 ] 6649 _cxx_generated_deps_for_rust = [ 6650 # The implementation of the Cxx library needs to be in the Rust target. 6651 - "//build/rust:cxx_cppdeps", 6652 + "//chromium/build/rust:cxx_cppdeps", 6653 ] 6654 } 6655 6656 @@ -325,18 +325,18 @@ template("rust_target") { 6657 # `no_chromium_prelude`. 6658 if (!defined(invoker.no_chromium_prelude) || !invoker.no_chromium_prelude) { 6659 if (enable_chromium_prelude) { 6660 - _rust_deps += [ "//build/rust/chromium_prelude" ] 6661 + _rust_deps += [ "//chromium/build/rust/chromium_prelude" ] 6662 } 6663 } 6664 6665 if (_cxx_bindings != []) { 6666 # The Rust target (and unit tests) need the Cxx crate when using it to 6667 # generate bindings. 6668 - _rust_deps += [ "//build/rust:cxx_rustdeps" ] 6669 + _rust_deps += [ "//chromium/build/rust:cxx_rustdeps" ] 6670 } 6671 6672 if (!defined(invoker.no_std) || !invoker.no_std) { 6673 - _rust_deps += [ "//build/rust/std" ] 6674 + _rust_deps += [ "//chromium/build/rust/std" ] 6675 } 6676 6677 if (_build_unit_tests) { 6678 @@ -379,7 +379,7 @@ template("rust_target") { 6679 rustenv = _rustenv 6680 6681 if (!_allow_unsafe) { 6682 - configs += [ "//build/rust:forbid_unsafe" ] 6683 + configs += [ "//chromium/build/rust:forbid_unsafe" ] 6684 } 6685 } 6686 } else { 6687 @@ -470,7 +470,7 @@ template("rust_target") { 6688 } 6689 6690 if (!_allow_unsafe) { 6691 - configs += [ "//build/rust:forbid_unsafe" ] 6692 + configs += [ "//chromium/build/rust:forbid_unsafe" ] 6693 } 6694 } 6695 6696 diff --git a/rust/rust_unit_test.gni b/rust/rust_unit_test.gni 6697 index be2bbeb4a..fd600b966 100644 6698 --- a/rust/rust_unit_test.gni 6699 +++ b/rust/rust_unit_test.gni 6700 @@ -2,8 +2,8 @@ 6701 # Use of this source code is governed by a BSD-style license that can be 6702 # found in the LICENSE file. 6703 6704 -import("//build/config/rust.gni") 6705 -import("//build/rust/rust_unit_tests_group.gni") 6706 +import("//chromium/build/config/rust.gni") 6707 +import("//chromium/build/rust/rust_unit_tests_group.gni") 6708 6709 # Defines a Rust unit test. 6710 # 6711 @@ -63,7 +63,7 @@ template("rust_unit_test") { 6712 if (defined(invoker.edition)) { 6713 _edition = invoker.edition 6714 } 6715 - _configs += [ "//build/rust:edition_${_edition}" ] 6716 + _configs += [ "//chromium/build/rust:edition_${_edition}" ] 6717 6718 # We require that all source files are listed, even though this is 6719 # not a requirement for rustc. The reason is to ensure that tools 6720 @@ -132,7 +132,7 @@ template("rust_unit_test") { 6721 } 6722 if (!defined(invoker.no_chromium_prelude) || !invoker.no_chromium_prelude) { 6723 if (enable_chromium_prelude) { 6724 - deps += [ "//build/rust/chromium_prelude" ] 6725 + deps += [ "//chromium/build/rust/chromium_prelude" ] 6726 } 6727 } 6728 } 6729 diff --git a/rust/std/BUILD.gn b/rust/std/BUILD.gn 6730 index 6b996aa1f..5442b54c4 100644 6731 --- a/rust/std/BUILD.gn 6732 +++ b/rust/std/BUILD.gn 6733 @@ -15,11 +15,11 @@ 6734 # allocator functions to PartitionAlloc when `use_partition_alloc_as_malloc` is 6735 # true, so that Rust and C++ use the same allocator backend. 6736 6737 -import("//build/buildflag_header.gni") 6738 -import("//build/config/compiler/compiler.gni") 6739 -import("//build/config/coverage/coverage.gni") 6740 -import("//build/config/rust.gni") 6741 -import("//build/config/sanitizers/sanitizers.gni") 6742 +import("//chromium/build/buildflag_header.gni") 6743 +import("//chromium/build/config/compiler/compiler.gni") 6744 +import("//chromium/build/config/coverage/coverage.gni") 6745 +import("//chromium/build/config/rust.gni") 6746 +import("//chromium/build/config/sanitizers/sanitizers.gni") 6747 6748 rust_allocator_uses_partition_alloc = false 6749 if (build_with_chromium) { 6750 diff --git a/rust/std/BUILD.gn.hbs b/rust/std/BUILD.gn.hbs 6751 index 40e1f202c..093467a53 100644 6752 --- a/rust/std/BUILD.gn.hbs 6753 +++ b/rust/std/BUILD.gn.hbs 6754 @@ -4,7 +4,7 @@ 6755 6756 # @generated from build/rust/std/BUILD.gn.hbs by tools/crates/gnrt. Do not edit! 6757 6758 -import("//build/rust/cargo_crate.gni") 6759 +import("//chromium/build/rust/cargo_crate.gni") 6760 6761 {{#each rules}} 6762 {{#with this.detail}} 6763 @@ -35,38 +35,38 @@ cargo_crate("{{../name}}") { 6764 cargo_pkg_description = "{{gn_escape this}}" 6765 {{/with}} 6766 library_configs -= [ 6767 - "//build/config/compiler:chromium_code", 6768 - "//build/config/compiler:disallow_unstable_features", 6769 + "//chromium/build/config/compiler:chromium_code", 6770 + "//chromium/build/config/compiler:disallow_unstable_features", 6771 {{#each remove_library_configs}} 6772 "{{this}}", 6773 {{/each}} 6774 {{#unless extra_kv.include_coverage}} 6775 - "//build/config/coverage:default_coverage", 6776 + "//chromium/build/config/coverage:default_coverage", 6777 {{/unless}} 6778 ] 6779 library_configs += [ 6780 - "//build/config/compiler:no_chromium_code", 6781 + "//chromium/build/config/compiler:no_chromium_code", 6782 {{#if extra_kv.immediate_abort}} 6783 - "//build/rust:panic_immediate_abort", 6784 + "//chromium/build/rust:panic_immediate_abort", 6785 {{/if}} 6786 ] 6787 executable_configs -= [ 6788 - "//build/config/compiler:chromium_code", 6789 - "//build/config/compiler:disallow_unstable_features", 6790 + "//chromium/build/config/compiler:chromium_code", 6791 + "//chromium/build/config/compiler:disallow_unstable_features", 6792 {{#each remove_executable_configs}} 6793 "{{this}}", 6794 {{/each}} 6795 ] 6796 executable_configs += [ 6797 - "//build/config/compiler:no_chromium_code", 6798 + "//chromium/build/config/compiler:no_chromium_code", 6799 {{#each add_executable_configs}} 6800 "{{this}}", 6801 {{/each}} 6802 ] 6803 deps = [ 6804 - "//build/rust/std:std_build_deps", 6805 + "//chromium/build/rust/std:std_build_deps", 6806 {{#if extra_kv.include_coverage}} 6807 - "//build/rust/std:profiler_builtins_group", 6808 + "//chromium/build/rust/std:profiler_builtins_group", 6809 {{/if}} 6810 {{#unless deps}} 6811 ] 6812 diff --git a/rust/std/rules/BUILD.gn b/rust/std/rules/BUILD.gn 6813 index 6a8234310..d5f8efac4 100644 6814 --- a/rust/std/rules/BUILD.gn 6815 +++ b/rust/std/rules/BUILD.gn 6816 @@ -4,7 +4,7 @@ 6817 6818 # @generated from build/rust/std/BUILD.gn.hbs by tools/crates/gnrt. Do not edit! 6819 6820 -import("//build/rust/cargo_crate.gni") 6821 +import("//chromium/build/rust/cargo_crate.gni") 6822 6823 cargo_crate("addr2line") { 6824 crate_type = "rlib" 6825 @@ -31,22 +31,22 @@ cargo_crate("addr2line") { 6826 cargo_pkg_description = 6827 "A cross-platform symbolication library written in Rust, using `gimli`" 6828 library_configs -= [ 6829 - "//build/config/compiler:chromium_code", 6830 - "//build/config/compiler:disallow_unstable_features", 6831 + "//chromium/build/config/compiler:chromium_code", 6832 + "//chromium/build/config/compiler:disallow_unstable_features", 6833 ] 6834 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 6835 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6836 executable_configs -= [ 6837 - "//build/config/compiler:chromium_code", 6838 - "//build/config/compiler:disallow_unstable_features", 6839 + "//chromium/build/config/compiler:chromium_code", 6840 + "//chromium/build/config/compiler:disallow_unstable_features", 6841 ] 6842 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 6843 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6844 deps = [ 6845 ":compiler_builtins", 6846 ":gimli", 6847 ":rustc_std_workspace_alloc", 6848 ":rustc_std_workspace_core", 6849 - "//build/rust/std:profiler_builtins_group", 6850 - "//build/rust/std:std_build_deps", 6851 + "//chromium/build/rust/std:profiler_builtins_group", 6852 + "//chromium/build/rust/std:std_build_deps", 6853 ] 6854 aliased_deps = { 6855 alloc = ":rustc_std_workspace_alloc" 6856 @@ -89,20 +89,20 @@ cargo_crate("adler2") { 6857 cargo_pkg_description = 6858 "A simple clean-room implementation of the Adler-32 checksum" 6859 library_configs -= [ 6860 - "//build/config/compiler:chromium_code", 6861 - "//build/config/compiler:disallow_unstable_features", 6862 + "//chromium/build/config/compiler:chromium_code", 6863 + "//chromium/build/config/compiler:disallow_unstable_features", 6864 ] 6865 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 6866 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6867 executable_configs -= [ 6868 - "//build/config/compiler:chromium_code", 6869 - "//build/config/compiler:disallow_unstable_features", 6870 + "//chromium/build/config/compiler:chromium_code", 6871 + "//chromium/build/config/compiler:disallow_unstable_features", 6872 ] 6873 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 6874 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6875 deps = [ 6876 ":compiler_builtins", 6877 ":rustc_std_workspace_core", 6878 - "//build/rust/std:profiler_builtins_group", 6879 - "//build/rust/std:std_build_deps", 6880 + "//chromium/build/rust/std:profiler_builtins_group", 6881 + "//chromium/build/rust/std:std_build_deps", 6882 ] 6883 aliased_deps = { 6884 core = ":rustc_std_workspace_core" 6885 @@ -209,20 +209,20 @@ cargo_crate("alloc") { 6886 cargo_pkg_name = "alloc" 6887 cargo_pkg_description = "The Rust core allocation and collections library" 6888 library_configs -= [ 6889 - "//build/config/compiler:chromium_code", 6890 - "//build/config/compiler:disallow_unstable_features", 6891 + "//chromium/build/config/compiler:chromium_code", 6892 + "//chromium/build/config/compiler:disallow_unstable_features", 6893 ] 6894 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 6895 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6896 executable_configs -= [ 6897 - "//build/config/compiler:chromium_code", 6898 - "//build/config/compiler:disallow_unstable_features", 6899 + "//chromium/build/config/compiler:chromium_code", 6900 + "//chromium/build/config/compiler:disallow_unstable_features", 6901 ] 6902 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 6903 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6904 deps = [ 6905 ":compiler_builtins", 6906 ":core", 6907 - "//build/rust/std:profiler_builtins_group", 6908 - "//build/rust/std:std_build_deps", 6909 + "//chromium/build/rust/std:profiler_builtins_group", 6910 + "//chromium/build/rust/std:std_build_deps", 6911 ] 6912 rustenv = [ 6913 "CFG_DISABLE_UNSTABLE_FEATURES=0", 6914 @@ -251,20 +251,20 @@ cargo_crate("cfg_if") { 6915 cargo_pkg_name = "cfg-if" 6916 cargo_pkg_description = "A macro to ergonomically define an item depending on a large number of #[cfg] parameters. Structured like an if-else chain, the first matching branch is the item that gets emitted." 6917 library_configs -= [ 6918 - "//build/config/compiler:chromium_code", 6919 - "//build/config/compiler:disallow_unstable_features", 6920 + "//chromium/build/config/compiler:chromium_code", 6921 + "//chromium/build/config/compiler:disallow_unstable_features", 6922 ] 6923 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 6924 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6925 executable_configs -= [ 6926 - "//build/config/compiler:chromium_code", 6927 - "//build/config/compiler:disallow_unstable_features", 6928 + "//chromium/build/config/compiler:chromium_code", 6929 + "//chromium/build/config/compiler:disallow_unstable_features", 6930 ] 6931 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 6932 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6933 deps = [ 6934 ":compiler_builtins", 6935 ":rustc_std_workspace_core", 6936 - "//build/rust/std:profiler_builtins_group", 6937 - "//build/rust/std:std_build_deps", 6938 + "//chromium/build/rust/std:profiler_builtins_group", 6939 + "//chromium/build/rust/std:std_build_deps", 6940 ] 6941 aliased_deps = { 6942 core = ":rustc_std_workspace_core" 6943 @@ -518,19 +518,19 @@ cargo_crate("compiler_builtins") { 6944 cargo_pkg_name = "compiler_builtins" 6945 cargo_pkg_description = "Compiler intrinsics used by the Rust compiler. Also available for other targets if necessary!" 6946 library_configs -= [ 6947 - "//build/config/compiler:chromium_code", 6948 - "//build/config/compiler:disallow_unstable_features", 6949 - "//build/config/coverage:default_coverage", 6950 + "//chromium/build/config/compiler:chromium_code", 6951 + "//chromium/build/config/compiler:disallow_unstable_features", 6952 + "//chromium/build/config/coverage:default_coverage", 6953 ] 6954 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 6955 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6956 executable_configs -= [ 6957 - "//build/config/compiler:chromium_code", 6958 - "//build/config/compiler:disallow_unstable_features", 6959 + "//chromium/build/config/compiler:chromium_code", 6960 + "//chromium/build/config/compiler:disallow_unstable_features", 6961 ] 6962 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 6963 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6964 deps = [ 6965 ":rustc_std_workspace_core", 6966 - "//build/rust/std:std_build_deps", 6967 + "//chromium/build/rust/std:std_build_deps", 6968 ] 6969 aliased_deps = { 6970 core = ":rustc_std_workspace_core" 6971 @@ -1062,20 +1062,20 @@ cargo_crate("core") { 6972 cargo_pkg_name = "core" 6973 cargo_pkg_description = "The Rust Core Library" 6974 library_configs -= [ 6975 - "//build/config/compiler:chromium_code", 6976 - "//build/config/compiler:disallow_unstable_features", 6977 - "//build/config/coverage:default_coverage", 6978 + "//chromium/build/config/compiler:chromium_code", 6979 + "//chromium/build/config/compiler:disallow_unstable_features", 6980 + "//chromium/build/config/coverage:default_coverage", 6981 ] 6982 library_configs += [ 6983 - "//build/config/compiler:no_chromium_code", 6984 - "//build/rust:panic_immediate_abort", 6985 + "//chromium/build/config/compiler:no_chromium_code", 6986 + "//chromium/build/rust:panic_immediate_abort", 6987 ] 6988 executable_configs -= [ 6989 - "//build/config/compiler:chromium_code", 6990 - "//build/config/compiler:disallow_unstable_features", 6991 + "//chromium/build/config/compiler:chromium_code", 6992 + "//chromium/build/config/compiler:disallow_unstable_features", 6993 ] 6994 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 6995 - deps = [ "//build/rust/std:std_build_deps" ] 6996 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 6997 + deps = [ "//chromium/build/rust/std:std_build_deps" ] 6998 rustenv = [ 6999 "CFG_DISABLE_UNSTABLE_FEATURES=0", 7000 "STD_ENV_ARCH=$rust_target_arch", 7001 @@ -1106,21 +1106,21 @@ cargo_crate("getopts") { 7002 cargo_pkg_name = "getopts" 7003 cargo_pkg_description = "getopts-like option parsing." 7004 library_configs -= [ 7005 - "//build/config/compiler:chromium_code", 7006 - "//build/config/compiler:disallow_unstable_features", 7007 + "//chromium/build/config/compiler:chromium_code", 7008 + "//chromium/build/config/compiler:disallow_unstable_features", 7009 ] 7010 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7011 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7012 executable_configs -= [ 7013 - "//build/config/compiler:chromium_code", 7014 - "//build/config/compiler:disallow_unstable_features", 7015 + "//chromium/build/config/compiler:chromium_code", 7016 + "//chromium/build/config/compiler:disallow_unstable_features", 7017 ] 7018 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7019 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7020 deps = [ 7021 ":rustc_std_workspace_core", 7022 ":rustc_std_workspace_std", 7023 ":unicode_width", 7024 - "//build/rust/std:profiler_builtins_group", 7025 - "//build/rust/std:std_build_deps", 7026 + "//chromium/build/rust/std:profiler_builtins_group", 7027 + "//chromium/build/rust/std:std_build_deps", 7028 ] 7029 aliased_deps = { 7030 core = ":rustc_std_workspace_core" 7031 @@ -1203,21 +1203,21 @@ cargo_crate("gimli") { 7032 cargo_pkg_description = 7033 "A library for reading and writing the DWARF debugging format." 7034 library_configs -= [ 7035 - "//build/config/compiler:chromium_code", 7036 - "//build/config/compiler:disallow_unstable_features", 7037 + "//chromium/build/config/compiler:chromium_code", 7038 + "//chromium/build/config/compiler:disallow_unstable_features", 7039 ] 7040 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7041 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7042 executable_configs -= [ 7043 - "//build/config/compiler:chromium_code", 7044 - "//build/config/compiler:disallow_unstable_features", 7045 + "//chromium/build/config/compiler:chromium_code", 7046 + "//chromium/build/config/compiler:disallow_unstable_features", 7047 ] 7048 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7049 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7050 deps = [ 7051 ":compiler_builtins", 7052 ":rustc_std_workspace_alloc", 7053 ":rustc_std_workspace_core", 7054 - "//build/rust/std:profiler_builtins_group", 7055 - "//build/rust/std:std_build_deps", 7056 + "//chromium/build/rust/std:profiler_builtins_group", 7057 + "//chromium/build/rust/std:std_build_deps", 7058 ] 7059 aliased_deps = { 7060 alloc = ":rustc_std_workspace_alloc" 7061 @@ -1282,21 +1282,21 @@ cargo_crate("hashbrown") { 7062 cargo_pkg_name = "hashbrown" 7063 cargo_pkg_description = "A Rust port of Google's SwissTable hash map" 7064 library_configs -= [ 7065 - "//build/config/compiler:chromium_code", 7066 - "//build/config/compiler:disallow_unstable_features", 7067 + "//chromium/build/config/compiler:chromium_code", 7068 + "//chromium/build/config/compiler:disallow_unstable_features", 7069 ] 7070 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7071 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7072 executable_configs -= [ 7073 - "//build/config/compiler:chromium_code", 7074 - "//build/config/compiler:disallow_unstable_features", 7075 + "//chromium/build/config/compiler:chromium_code", 7076 + "//chromium/build/config/compiler:disallow_unstable_features", 7077 ] 7078 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7079 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7080 deps = [ 7081 ":compiler_builtins", 7082 ":rustc_std_workspace_alloc", 7083 ":rustc_std_workspace_core", 7084 - "//build/rust/std:profiler_builtins_group", 7085 - "//build/rust/std:std_build_deps", 7086 + "//chromium/build/rust/std:profiler_builtins_group", 7087 + "//chromium/build/rust/std:std_build_deps", 7088 ] 7089 aliased_deps = { 7090 alloc = ":rustc_std_workspace_alloc" 7091 @@ -1519,19 +1519,19 @@ cargo_crate("libc") { 7092 cargo_pkg_name = "libc" 7093 cargo_pkg_description = "Raw FFI bindings to platform libraries like libc." 7094 library_configs -= [ 7095 - "//build/config/compiler:chromium_code", 7096 - "//build/config/compiler:disallow_unstable_features", 7097 - "//build/config/coverage:default_coverage", 7098 + "//chromium/build/config/compiler:chromium_code", 7099 + "//chromium/build/config/compiler:disallow_unstable_features", 7100 + "//chromium/build/config/coverage:default_coverage", 7101 ] 7102 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7103 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7104 executable_configs -= [ 7105 - "//build/config/compiler:chromium_code", 7106 - "//build/config/compiler:disallow_unstable_features", 7107 + "//chromium/build/config/compiler:chromium_code", 7108 + "//chromium/build/config/compiler:disallow_unstable_features", 7109 ] 7110 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7111 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7112 deps = [ 7113 ":rustc_std_workspace_core", 7114 - "//build/rust/std:std_build_deps", 7115 + "//chromium/build/rust/std:std_build_deps", 7116 ] 7117 features = [ 7118 "align", 7119 @@ -1613,20 +1613,20 @@ cargo_crate("memchr") { 7120 cargo_pkg_name = "memchr" 7121 cargo_pkg_description = "Provides extremely fast (uses SIMD on x86_64, aarch64 and wasm32) routines for 1, 2 or 3 byte search and single substring search." 7122 library_configs -= [ 7123 - "//build/config/compiler:chromium_code", 7124 - "//build/config/compiler:disallow_unstable_features", 7125 + "//chromium/build/config/compiler:chromium_code", 7126 + "//chromium/build/config/compiler:disallow_unstable_features", 7127 ] 7128 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7129 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7130 executable_configs -= [ 7131 - "//build/config/compiler:chromium_code", 7132 - "//build/config/compiler:disallow_unstable_features", 7133 + "//chromium/build/config/compiler:chromium_code", 7134 + "//chromium/build/config/compiler:disallow_unstable_features", 7135 ] 7136 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7137 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7138 deps = [ 7139 ":compiler_builtins", 7140 ":rustc_std_workspace_core", 7141 - "//build/rust/std:profiler_builtins_group", 7142 - "//build/rust/std:std_build_deps", 7143 + "//chromium/build/rust/std:profiler_builtins_group", 7144 + "//chromium/build/rust/std:std_build_deps", 7145 ] 7146 aliased_deps = { 7147 core = ":rustc_std_workspace_core" 7148 @@ -1676,22 +1676,22 @@ cargo_crate("miniz_oxide") { 7149 cargo_pkg_name = "miniz_oxide" 7150 cargo_pkg_description = "DEFLATE compression and decompression library rewritten in Rust based on miniz" 7151 library_configs -= [ 7152 - "//build/config/compiler:chromium_code", 7153 - "//build/config/compiler:disallow_unstable_features", 7154 + "//chromium/build/config/compiler:chromium_code", 7155 + "//chromium/build/config/compiler:disallow_unstable_features", 7156 ] 7157 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7158 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7159 executable_configs -= [ 7160 - "//build/config/compiler:chromium_code", 7161 - "//build/config/compiler:disallow_unstable_features", 7162 + "//chromium/build/config/compiler:chromium_code", 7163 + "//chromium/build/config/compiler:disallow_unstable_features", 7164 ] 7165 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7166 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7167 deps = [ 7168 ":adler2", 7169 ":compiler_builtins", 7170 ":rustc_std_workspace_alloc", 7171 ":rustc_std_workspace_core", 7172 - "//build/rust/std:profiler_builtins_group", 7173 - "//build/rust/std:std_build_deps", 7174 + "//chromium/build/rust/std:profiler_builtins_group", 7175 + "//chromium/build/rust/std:std_build_deps", 7176 ] 7177 aliased_deps = { 7178 alloc = ":rustc_std_workspace_alloc" 7179 @@ -1811,22 +1811,22 @@ cargo_crate("object") { 7180 cargo_pkg_description = 7181 "A unified interface for reading and writing object file formats." 7182 library_configs -= [ 7183 - "//build/config/compiler:chromium_code", 7184 - "//build/config/compiler:disallow_unstable_features", 7185 + "//chromium/build/config/compiler:chromium_code", 7186 + "//chromium/build/config/compiler:disallow_unstable_features", 7187 ] 7188 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7189 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7190 executable_configs -= [ 7191 - "//build/config/compiler:chromium_code", 7192 - "//build/config/compiler:disallow_unstable_features", 7193 + "//chromium/build/config/compiler:chromium_code", 7194 + "//chromium/build/config/compiler:disallow_unstable_features", 7195 ] 7196 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7197 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7198 deps = [ 7199 ":compiler_builtins", 7200 ":memchr", 7201 ":rustc_std_workspace_alloc", 7202 ":rustc_std_workspace_core", 7203 - "//build/rust/std:profiler_builtins_group", 7204 - "//build/rust/std:std_build_deps", 7205 + "//chromium/build/rust/std:profiler_builtins_group", 7206 + "//chromium/build/rust/std:std_build_deps", 7207 ] 7208 aliased_deps = { 7209 alloc = ":rustc_std_workspace_alloc" 7210 @@ -1878,22 +1878,22 @@ cargo_crate("panic_abort") { 7211 cargo_pkg_name = "panic_abort" 7212 cargo_pkg_description = "Implementation of Rust panics via process aborts" 7213 library_configs -= [ 7214 - "//build/config/compiler:chromium_code", 7215 - "//build/config/compiler:disallow_unstable_features", 7216 + "//chromium/build/config/compiler:chromium_code", 7217 + "//chromium/build/config/compiler:disallow_unstable_features", 7218 ] 7219 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7220 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7221 executable_configs -= [ 7222 - "//build/config/compiler:chromium_code", 7223 - "//build/config/compiler:disallow_unstable_features", 7224 + "//chromium/build/config/compiler:chromium_code", 7225 + "//chromium/build/config/compiler:disallow_unstable_features", 7226 ] 7227 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7228 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7229 deps = [ 7230 ":alloc", 7231 ":cfg_if", 7232 ":compiler_builtins", 7233 ":core", 7234 - "//build/rust/std:profiler_builtins_group", 7235 - "//build/rust/std:std_build_deps", 7236 + "//chromium/build/rust/std:profiler_builtins_group", 7237 + "//chromium/build/rust/std:std_build_deps", 7238 ] 7239 if (!is_win) { 7240 deps += [ ":libc" ] 7241 @@ -1932,23 +1932,23 @@ cargo_crate("panic_unwind") { 7242 cargo_pkg_name = "panic_unwind" 7243 cargo_pkg_description = "Implementation of Rust panics via stack unwinding" 7244 library_configs -= [ 7245 - "//build/config/compiler:chromium_code", 7246 - "//build/config/compiler:disallow_unstable_features", 7247 + "//chromium/build/config/compiler:chromium_code", 7248 + "//chromium/build/config/compiler:disallow_unstable_features", 7249 ] 7250 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7251 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7252 executable_configs -= [ 7253 - "//build/config/compiler:chromium_code", 7254 - "//build/config/compiler:disallow_unstable_features", 7255 + "//chromium/build/config/compiler:chromium_code", 7256 + "//chromium/build/config/compiler:disallow_unstable_features", 7257 ] 7258 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7259 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7260 deps = [ 7261 ":alloc", 7262 ":cfg_if", 7263 ":compiler_builtins", 7264 ":core", 7265 ":unwind", 7266 - "//build/rust/std:profiler_builtins_group", 7267 - "//build/rust/std:std_build_deps", 7268 + "//chromium/build/rust/std:profiler_builtins_group", 7269 + "//chromium/build/rust/std:std_build_deps", 7270 ] 7271 if (!is_win) { 7272 deps += [ ":libc" ] 7273 @@ -1995,20 +1995,20 @@ cargo_crate("proc_macro") { 7274 cargo_pkg_version = "0.0.0" 7275 cargo_pkg_name = "proc_macro" 7276 library_configs -= [ 7277 - "//build/config/compiler:chromium_code", 7278 - "//build/config/compiler:disallow_unstable_features", 7279 + "//chromium/build/config/compiler:chromium_code", 7280 + "//chromium/build/config/compiler:disallow_unstable_features", 7281 ] 7282 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7283 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7284 executable_configs -= [ 7285 - "//build/config/compiler:chromium_code", 7286 - "//build/config/compiler:disallow_unstable_features", 7287 + "//chromium/build/config/compiler:chromium_code", 7288 + "//chromium/build/config/compiler:disallow_unstable_features", 7289 ] 7290 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7291 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7292 deps = [ 7293 ":core", 7294 ":std", 7295 - "//build/rust/std:profiler_builtins_group", 7296 - "//build/rust/std:std_build_deps", 7297 + "//chromium/build/rust/std:profiler_builtins_group", 7298 + "//chromium/build/rust/std:std_build_deps", 7299 ] 7300 rustenv = [ 7301 "CFG_DISABLE_UNSTABLE_FEATURES=0", 7302 @@ -2035,17 +2035,17 @@ cargo_crate("profiler_builtins") { 7303 cargo_pkg_version = "0.0.0" 7304 cargo_pkg_name = "profiler_builtins" 7305 library_configs -= [ 7306 - "//build/config/compiler:chromium_code", 7307 - "//build/config/compiler:disallow_unstable_features", 7308 - "//build/config/coverage:default_coverage", 7309 + "//chromium/build/config/compiler:chromium_code", 7310 + "//chromium/build/config/compiler:disallow_unstable_features", 7311 + "//chromium/build/config/coverage:default_coverage", 7312 ] 7313 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7314 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7315 executable_configs -= [ 7316 - "//build/config/compiler:chromium_code", 7317 - "//build/config/compiler:disallow_unstable_features", 7318 + "//chromium/build/config/compiler:chromium_code", 7319 + "//chromium/build/config/compiler:disallow_unstable_features", 7320 ] 7321 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7322 - deps = [ "//build/rust/std:std_build_deps" ] 7323 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7324 + deps = [ "//chromium/build/rust/std:std_build_deps" ] 7325 rustenv = [ 7326 "CFG_DISABLE_UNSTABLE_FEATURES=0", 7327 "STD_ENV_ARCH=$rust_target_arch", 7328 @@ -2077,20 +2077,20 @@ cargo_crate("rustc_demangle") { 7329 cargo_pkg_name = "rustc-demangle" 7330 cargo_pkg_description = "Rust compiler symbol demangling." 7331 library_configs -= [ 7332 - "//build/config/compiler:chromium_code", 7333 - "//build/config/compiler:disallow_unstable_features", 7334 + "//chromium/build/config/compiler:chromium_code", 7335 + "//chromium/build/config/compiler:disallow_unstable_features", 7336 ] 7337 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7338 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7339 executable_configs -= [ 7340 - "//build/config/compiler:chromium_code", 7341 - "//build/config/compiler:disallow_unstable_features", 7342 + "//chromium/build/config/compiler:chromium_code", 7343 + "//chromium/build/config/compiler:disallow_unstable_features", 7344 ] 7345 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7346 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7347 deps = [ 7348 ":compiler_builtins", 7349 ":rustc_std_workspace_core", 7350 - "//build/rust/std:profiler_builtins_group", 7351 - "//build/rust/std:std_build_deps", 7352 + "//chromium/build/rust/std:profiler_builtins_group", 7353 + "//chromium/build/rust/std:std_build_deps", 7354 ] 7355 aliased_deps = { 7356 core = ":rustc_std_workspace_core" 7357 @@ -2126,19 +2126,19 @@ cargo_crate("rustc_std_workspace_alloc") { 7358 cargo_pkg_name = "rustc-std-workspace-alloc" 7359 cargo_pkg_description = "Hack for the compiler's own build system" 7360 library_configs -= [ 7361 - "//build/config/compiler:chromium_code", 7362 - "//build/config/compiler:disallow_unstable_features", 7363 - "//build/config/coverage:default_coverage", 7364 + "//chromium/build/config/compiler:chromium_code", 7365 + "//chromium/build/config/compiler:disallow_unstable_features", 7366 + "//chromium/build/config/coverage:default_coverage", 7367 ] 7368 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7369 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7370 executable_configs -= [ 7371 - "//build/config/compiler:chromium_code", 7372 - "//build/config/compiler:disallow_unstable_features", 7373 + "//chromium/build/config/compiler:chromium_code", 7374 + "//chromium/build/config/compiler:disallow_unstable_features", 7375 ] 7376 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7377 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7378 deps = [ 7379 ":alloc", 7380 - "//build/rust/std:std_build_deps", 7381 + "//chromium/build/rust/std:std_build_deps", 7382 ] 7383 rustenv = [ 7384 "CFG_DISABLE_UNSTABLE_FEATURES=0", 7385 @@ -2166,19 +2166,19 @@ cargo_crate("rustc_std_workspace_core") { 7386 cargo_pkg_name = "rustc-std-workspace-core" 7387 cargo_pkg_description = "Hack for the compiler's own build system" 7388 library_configs -= [ 7389 - "//build/config/compiler:chromium_code", 7390 - "//build/config/compiler:disallow_unstable_features", 7391 - "//build/config/coverage:default_coverage", 7392 + "//chromium/build/config/compiler:chromium_code", 7393 + "//chromium/build/config/compiler:disallow_unstable_features", 7394 + "//chromium/build/config/coverage:default_coverage", 7395 ] 7396 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7397 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7398 executable_configs -= [ 7399 - "//build/config/compiler:chromium_code", 7400 - "//build/config/compiler:disallow_unstable_features", 7401 + "//chromium/build/config/compiler:chromium_code", 7402 + "//chromium/build/config/compiler:disallow_unstable_features", 7403 ] 7404 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7405 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7406 deps = [ 7407 ":core", 7408 - "//build/rust/std:std_build_deps", 7409 + "//chromium/build/rust/std:std_build_deps", 7410 ] 7411 rustenv = [ 7412 "CFG_DISABLE_UNSTABLE_FEATURES=0", 7413 @@ -2206,19 +2206,19 @@ cargo_crate("rustc_std_workspace_std") { 7414 cargo_pkg_name = "rustc-std-workspace-std" 7415 cargo_pkg_description = "Hack for the compiler's own build system" 7416 library_configs -= [ 7417 - "//build/config/compiler:chromium_code", 7418 - "//build/config/compiler:disallow_unstable_features", 7419 + "//chromium/build/config/compiler:chromium_code", 7420 + "//chromium/build/config/compiler:disallow_unstable_features", 7421 ] 7422 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7423 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7424 executable_configs -= [ 7425 - "//build/config/compiler:chromium_code", 7426 - "//build/config/compiler:disallow_unstable_features", 7427 + "//chromium/build/config/compiler:chromium_code", 7428 + "//chromium/build/config/compiler:disallow_unstable_features", 7429 ] 7430 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7431 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7432 deps = [ 7433 ":std", 7434 - "//build/rust/std:profiler_builtins_group", 7435 - "//build/rust/std:std_build_deps", 7436 + "//chromium/build/rust/std:profiler_builtins_group", 7437 + "//chromium/build/rust/std:std_build_deps", 7438 ] 7439 rustenv = [ 7440 "CFG_DISABLE_UNSTABLE_FEATURES=0", 7441 @@ -2890,18 +2890,18 @@ cargo_crate("std") { 7442 cargo_pkg_name = "std" 7443 cargo_pkg_description = "The Rust Standard Library" 7444 library_configs -= [ 7445 - "//build/config/compiler:chromium_code", 7446 - "//build/config/compiler:disallow_unstable_features", 7447 + "//chromium/build/config/compiler:chromium_code", 7448 + "//chromium/build/config/compiler:disallow_unstable_features", 7449 ] 7450 library_configs += [ 7451 - "//build/config/compiler:no_chromium_code", 7452 - "//build/rust:panic_immediate_abort", 7453 + "//chromium/build/config/compiler:no_chromium_code", 7454 + "//chromium/build/rust:panic_immediate_abort", 7455 ] 7456 executable_configs -= [ 7457 - "//build/config/compiler:chromium_code", 7458 - "//build/config/compiler:disallow_unstable_features", 7459 + "//chromium/build/config/compiler:chromium_code", 7460 + "//chromium/build/config/compiler:disallow_unstable_features", 7461 ] 7462 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7463 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7464 deps = [ 7465 ":alloc", 7466 ":cfg_if", 7467 @@ -2913,8 +2913,8 @@ cargo_crate("std") { 7468 ":rustc_demangle", 7469 ":std_detect", 7470 ":unwind", 7471 - "//build/rust/std:profiler_builtins_group", 7472 - "//build/rust/std:std_build_deps", 7473 + "//chromium/build/rust/std:profiler_builtins_group", 7474 + "//chromium/build/rust/std:std_build_deps", 7475 ] 7476 if (!is_win) { 7477 deps += [ 7478 @@ -3007,22 +3007,22 @@ cargo_crate("std_detect") { 7479 cargo_pkg_description = 7480 "`std::detect` - Rust's standard library run-time CPU feature detection." 7481 library_configs -= [ 7482 - "//build/config/compiler:chromium_code", 7483 - "//build/config/compiler:disallow_unstable_features", 7484 + "//chromium/build/config/compiler:chromium_code", 7485 + "//chromium/build/config/compiler:disallow_unstable_features", 7486 ] 7487 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7488 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7489 executable_configs -= [ 7490 - "//build/config/compiler:chromium_code", 7491 - "//build/config/compiler:disallow_unstable_features", 7492 + "//chromium/build/config/compiler:chromium_code", 7493 + "//chromium/build/config/compiler:disallow_unstable_features", 7494 ] 7495 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7496 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7497 deps = [ 7498 ":cfg_if", 7499 ":compiler_builtins", 7500 ":rustc_std_workspace_alloc", 7501 ":rustc_std_workspace_core", 7502 - "//build/rust/std:profiler_builtins_group", 7503 - "//build/rust/std:std_build_deps", 7504 + "//chromium/build/rust/std:profiler_builtins_group", 7505 + "//chromium/build/rust/std:std_build_deps", 7506 ] 7507 if (!is_win) { 7508 deps += [ ":libc" ] 7509 @@ -3065,22 +3065,22 @@ cargo_crate("sysroot") { 7510 cargo_pkg_version = "0.0.0" 7511 cargo_pkg_name = "sysroot" 7512 library_configs -= [ 7513 - "//build/config/compiler:chromium_code", 7514 - "//build/config/compiler:disallow_unstable_features", 7515 + "//chromium/build/config/compiler:chromium_code", 7516 + "//chromium/build/config/compiler:disallow_unstable_features", 7517 ] 7518 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7519 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7520 executable_configs -= [ 7521 - "//build/config/compiler:chromium_code", 7522 - "//build/config/compiler:disallow_unstable_features", 7523 + "//chromium/build/config/compiler:chromium_code", 7524 + "//chromium/build/config/compiler:disallow_unstable_features", 7525 ] 7526 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7527 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7528 deps = [ 7529 ":proc_macro", 7530 ":profiler_builtins", 7531 ":std", 7532 ":test", 7533 - "//build/rust/std:profiler_builtins_group", 7534 - "//build/rust/std:std_build_deps", 7535 + "//chromium/build/rust/std:profiler_builtins_group", 7536 + "//chromium/build/rust/std:std_build_deps", 7537 ] 7538 features = [ 7539 "backtrace", 7540 @@ -3145,21 +3145,21 @@ cargo_crate("test") { 7541 cargo_pkg_version = "0.0.0" 7542 cargo_pkg_name = "test" 7543 library_configs -= [ 7544 - "//build/config/compiler:chromium_code", 7545 - "//build/config/compiler:disallow_unstable_features", 7546 + "//chromium/build/config/compiler:chromium_code", 7547 + "//chromium/build/config/compiler:disallow_unstable_features", 7548 ] 7549 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7550 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7551 executable_configs -= [ 7552 - "//build/config/compiler:chromium_code", 7553 - "//build/config/compiler:disallow_unstable_features", 7554 + "//chromium/build/config/compiler:chromium_code", 7555 + "//chromium/build/config/compiler:disallow_unstable_features", 7556 ] 7557 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7558 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7559 deps = [ 7560 ":core", 7561 ":getopts", 7562 ":std", 7563 - "//build/rust/std:profiler_builtins_group", 7564 - "//build/rust/std:std_build_deps", 7565 + "//chromium/build/rust/std:profiler_builtins_group", 7566 + "//chromium/build/rust/std:std_build_deps", 7567 ] 7568 if (!is_win) { 7569 deps += [ ":libc" ] 7570 @@ -3195,21 +3195,21 @@ cargo_crate("unicode_width") { 7571 cargo_pkg_name = "unicode-width" 7572 cargo_pkg_description = "Determine displayed width of `char` and `str` types according to Unicode Standard Annex #11 rules." 7573 library_configs -= [ 7574 - "//build/config/compiler:chromium_code", 7575 - "//build/config/compiler:disallow_unstable_features", 7576 + "//chromium/build/config/compiler:chromium_code", 7577 + "//chromium/build/config/compiler:disallow_unstable_features", 7578 ] 7579 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7580 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7581 executable_configs -= [ 7582 - "//build/config/compiler:chromium_code", 7583 - "//build/config/compiler:disallow_unstable_features", 7584 + "//chromium/build/config/compiler:chromium_code", 7585 + "//chromium/build/config/compiler:disallow_unstable_features", 7586 ] 7587 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7588 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7589 deps = [ 7590 ":compiler_builtins", 7591 ":rustc_std_workspace_core", 7592 ":rustc_std_workspace_std", 7593 - "//build/rust/std:profiler_builtins_group", 7594 - "//build/rust/std:std_build_deps", 7595 + "//chromium/build/rust/std:profiler_builtins_group", 7596 + "//chromium/build/rust/std:std_build_deps", 7597 ] 7598 aliased_deps = { 7599 core = ":rustc_std_workspace_core" 7600 @@ -3252,21 +3252,21 @@ cargo_crate("unwind") { 7601 cargo_pkg_version = "0.0.0" 7602 cargo_pkg_name = "unwind" 7603 library_configs -= [ 7604 - "//build/config/compiler:chromium_code", 7605 - "//build/config/compiler:disallow_unstable_features", 7606 + "//chromium/build/config/compiler:chromium_code", 7607 + "//chromium/build/config/compiler:disallow_unstable_features", 7608 ] 7609 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7610 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7611 executable_configs -= [ 7612 - "//build/config/compiler:chromium_code", 7613 - "//build/config/compiler:disallow_unstable_features", 7614 + "//chromium/build/config/compiler:chromium_code", 7615 + "//chromium/build/config/compiler:disallow_unstable_features", 7616 ] 7617 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7618 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7619 deps = [ 7620 ":cfg_if", 7621 ":compiler_builtins", 7622 ":core", 7623 - "//build/rust/std:profiler_builtins_group", 7624 - "//build/rust/std:std_build_deps", 7625 + "//chromium/build/rust/std:profiler_builtins_group", 7626 + "//chromium/build/rust/std:std_build_deps", 7627 ] 7628 if (!is_win) { 7629 deps += [ ":libc" ] 7630 @@ -3298,17 +3298,17 @@ cargo_crate("windows_targets") { 7631 cargo_pkg_name = "windows-targets" 7632 cargo_pkg_description = "A drop-in replacement for the real windows-targets crate for use in std only." 7633 library_configs -= [ 7634 - "//build/config/compiler:chromium_code", 7635 - "//build/config/compiler:disallow_unstable_features", 7636 - "//build/config/coverage:default_coverage", 7637 + "//chromium/build/config/compiler:chromium_code", 7638 + "//chromium/build/config/compiler:disallow_unstable_features", 7639 + "//chromium/build/config/coverage:default_coverage", 7640 ] 7641 - library_configs += [ "//build/config/compiler:no_chromium_code" ] 7642 + library_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7643 executable_configs -= [ 7644 - "//build/config/compiler:chromium_code", 7645 - "//build/config/compiler:disallow_unstable_features", 7646 + "//chromium/build/config/compiler:chromium_code", 7647 + "//chromium/build/config/compiler:disallow_unstable_features", 7648 ] 7649 - executable_configs += [ "//build/config/compiler:no_chromium_code" ] 7650 - deps = [ "//build/rust/std:std_build_deps" ] 7651 + executable_configs += [ "//chromium/build/config/compiler:no_chromium_code" ] 7652 + deps = [ "//chromium/build/rust/std:std_build_deps" ] 7653 rustenv = [ 7654 "CFG_DISABLE_UNSTABLE_FEATURES=0", 7655 "STD_ENV_ARCH=$rust_target_arch", 7656 diff --git a/rust/tests/BUILD.gn b/rust/tests/BUILD.gn 7657 index 5a2c262e0..102bffd05 100644 7658 --- a/rust/tests/BUILD.gn 7659 +++ b/rust/tests/BUILD.gn 7660 @@ -2,8 +2,8 @@ 7661 # Use of this source code is governed by a BSD-style license that can be 7662 # found in the LICENSE file. 7663 7664 -import("//build/config/rust.gni") 7665 -import("//build/rust/rust_unit_tests_group.gni") 7666 +import("//chromium/build/config/rust.gni") 7667 +import("//chromium/build/rust/rust_unit_tests_group.gni") 7668 7669 # Build some minimal binaries to exercise the Rust toolchain 7670 # only if that toolchain is enabled in gn args. 7671 @@ -23,21 +23,21 @@ group("deps") { 7672 # All the rest require Rust. 7673 if (toolchain_has_rust) { 7674 deps += [ 7675 - "//build/rust/tests/bindgen_cpp_test_with_cpp_linkage", 7676 - "//build/rust/tests/bindgen_static_fns_test", 7677 - "//build/rust/tests/bindgen_test", 7678 - "//build/rust/tests/test_aliased_deps", 7679 - "//build/rust/tests/test_aliased_deps:test_aliased_deps_exe", 7680 - "//build/rust/tests/test_bin_crate", 7681 - "//build/rust/tests/test_rlib_crate:target1", 7682 - "//build/rust/tests/test_rlib_crate:target2", 7683 - "//build/rust/tests/test_rlib_crate:test_rlib_crate_associated_bin", 7684 - "//build/rust/tests/test_rlib_crate_testonly:testonly_target", 7685 - "//build/rust/tests/test_rust_exe_2", 7686 - "//build/rust/tests/test_rust_metadata:test_rust_metadata_cc_exe", 7687 - "//build/rust/tests/test_rust_metadata:test_rust_metadata_exe", 7688 - "//build/rust/tests/test_rust_multiple_dep_versions_exe", 7689 - "//build/rust/tests/test_simple_rust_exe", 7690 + "//chromium/build/rust/tests/bindgen_cpp_test_with_cpp_linkage", 7691 + "//chromium/build/rust/tests/bindgen_static_fns_test", 7692 + "//chromium/build/rust/tests/bindgen_test", 7693 + "//chromium/build/rust/tests/test_aliased_deps", 7694 + "//chromium/build/rust/tests/test_aliased_deps:test_aliased_deps_exe", 7695 + "//chromium/build/rust/tests/test_bin_crate", 7696 + "//chromium/build/rust/tests/test_rlib_crate:target1", 7697 + "//chromium/build/rust/tests/test_rlib_crate:target2", 7698 + "//chromium/build/rust/tests/test_rlib_crate:test_rlib_crate_associated_bin", 7699 + "//chromium/build/rust/tests/test_rlib_crate_testonly:testonly_target", 7700 + "//chromium/build/rust/tests/test_rust_exe_2", 7701 + "//chromium/build/rust/tests/test_rust_metadata:test_rust_metadata_cc_exe", 7702 + "//chromium/build/rust/tests/test_rust_metadata:test_rust_metadata_exe", 7703 + "//chromium/build/rust/tests/test_rust_multiple_dep_versions_exe", 7704 + "//chromium/build/rust/tests/test_simple_rust_exe", 7705 7706 # TODO(crbug.com/40226863): Enable the additional target below 7707 # once `rs_bindings_from_cc` is distributed via `gclient sync`. In the 7708 @@ -51,44 +51,44 @@ group("deps") { 7709 # selection below is _loosely_ based on `is_valid_x86_target` from 7710 # the top-level `//BUILD.gn`. 7711 if (is_win || is_android) { 7712 - deps += [ "//build/rust/tests/test_build_rs_target_arch_x86" ] 7713 + deps += [ "//chromium/build/rust/tests/test_build_rs_target_arch_x86" ] 7714 } 7715 } 7716 7717 if (!(is_apple && is_official_build)) { 7718 # TODO: crbug.com/372055517 - Apple lld has an ordering dependency bug 7719 # when LTO is enabled, and this particular build target runs into that. 7720 - deps += [ "//build/rust/tests/bindgen_cpp_test" ] 7721 + deps += [ "//chromium/build/rust/tests/bindgen_cpp_test" ] 7722 } 7723 7724 if (enable_chromium_prelude) { 7725 - deps += [ "//build/rust/chromium_prelude:import_test" ] 7726 + deps += [ "//chromium/build/rust/chromium_prelude:import_test" ] 7727 } 7728 if (enable_rust_cxx) { 7729 deps += [ 7730 - "//build/rust/tests/test_cpp_including_rust", 7731 - "//build/rust/tests/test_rust_calling_cpp", 7732 - "//build/rust/tests/test_rust_exe", 7733 - "//build/rust/tests/test_rust_static_library", 7734 + "//chromium/build/rust/tests/test_cpp_including_rust", 7735 + "//chromium/build/rust/tests/test_rust_calling_cpp", 7736 + "//chromium/build/rust/tests/test_rust_exe", 7737 + "//chromium/build/rust/tests/test_rust_static_library", 7738 ] 7739 } 7740 if (build_with_chromium) { 7741 # This tests integration with a 3p library that downstream projects 7742 # don't need to have. 7743 - deps += [ "//build/rust/tests/test_serde_json_lenient" ] 7744 + deps += [ "//chromium/build/rust/tests/test_serde_json_lenient" ] 7745 } 7746 7747 if (can_build_rust_unit_tests) { 7748 deps += [ 7749 - "//build/rust/tests/bindgen_static_fns_test:bindgen_static_fns_test_lib_unittests", 7750 - "//build/rust/tests/bindgen_test:bindgen_test_lib_unittests", 7751 - "//build/rust/tests/test_aliased_deps:test_aliased_deps_unittests", 7752 - "//build/rust/tests/test_rlib_crate:target1_test_rlib_crate_v0_2_unittests", 7753 - "//build/rust/tests/test_rlib_crate:target2_test_rlib_crate_v0_2_unittests", 7754 - "//build/rust/tests/test_rust_metadata:test_rust_metadata_unittests", 7755 - "//build/rust/tests/test_rust_multiple_dep_versions_exe/v1:test_lib_v1_unittests", 7756 - "//build/rust/tests/test_rust_multiple_dep_versions_exe/v2:test_lib_v2_unittests", 7757 - "//build/rust/tests/test_rust_static_library_non_standard_arrangement:foo_tests", 7758 + "//chromium/build/rust/tests/bindgen_static_fns_test:bindgen_static_fns_test_lib_unittests", 7759 + "//chromium/build/rust/tests/bindgen_test:bindgen_test_lib_unittests", 7760 + "//chromium/build/rust/tests/test_aliased_deps:test_aliased_deps_unittests", 7761 + "//chromium/build/rust/tests/test_rlib_crate:target1_test_rlib_crate_v0_2_unittests", 7762 + "//chromium/build/rust/tests/test_rlib_crate:target2_test_rlib_crate_v0_2_unittests", 7763 + "//chromium/build/rust/tests/test_rust_metadata:test_rust_metadata_unittests", 7764 + "//chromium/build/rust/tests/test_rust_multiple_dep_versions_exe/v1:test_lib_v1_unittests", 7765 + "//chromium/build/rust/tests/test_rust_multiple_dep_versions_exe/v2:test_lib_v2_unittests", 7766 + "//chromium/build/rust/tests/test_rust_static_library_non_standard_arrangement:foo_tests", 7767 7768 # TODO(crbug.com/40226863): Enable the additional target below 7769 # once `rs_bindings_from_cc` is distributed via `gclient sync`. In the 7770 @@ -99,10 +99,10 @@ group("deps") { 7771 7772 if (enable_rust_cxx) { 7773 deps += [ 7774 - "//build/rust/tests/test_cpp_including_rust:test_cpp_including_rust_unittests", 7775 - "//build/rust/tests/test_rust_exe:test_rust_exe_unittests", 7776 - "//build/rust/tests/test_rust_static_library:test_rust_static_library_unittests", 7777 - "//build/rust/tests/test_rust_unittests", 7778 + "//chromium/build/rust/tests/test_cpp_including_rust:test_cpp_including_rust_unittests", 7779 + "//chromium/build/rust/tests/test_rust_exe:test_rust_exe_unittests", 7780 + "//chromium/build/rust/tests/test_rust_static_library:test_rust_static_library_unittests", 7781 + "//chromium/build/rust/tests/test_rust_unittests", 7782 ] 7783 } 7784 } 7785 @@ -111,21 +111,21 @@ group("deps") { 7786 # are incompatible with shared library compilation in non-component builds 7787 # (such as code coverage https://crbug.com/1457533). 7788 if (is_component_build && enable_rust_cxx) { 7789 - deps += [ "//build/rust/tests/test_rust_shared_library" ] 7790 + deps += [ "//chromium/build/rust/tests/test_rust_shared_library" ] 7791 if (can_build_rust_unit_tests) { 7792 - deps += [ "//build/rust/tests/test_cpp_including_rust:test_cpp_including_rust_dylib_unittests" ] 7793 + deps += [ "//chromium/build/rust/tests/test_cpp_including_rust:test_cpp_including_rust_dylib_unittests" ] 7794 7795 # TODO(crbug.com/40266882): The shared library unittest EXE ends up 7796 # requiring the DLL to run, even though it does not use the DLL. 7797 if (!is_win && !is_mac) { 7798 - deps += [ "//build/rust/tests/test_rust_shared_library:test_rust_shared_library_unittests" ] 7799 + deps += [ "//chromium/build/rust/tests/test_rust_shared_library:test_rust_shared_library_unittests" ] 7800 } 7801 } 7802 } 7803 7804 if (is_win) { 7805 - deps += [ "//build/rust/tests/windows_sys_test" ] 7806 - deps += [ "//build/rust/tests/test_control_flow_guard" ] 7807 + deps += [ "//chromium/build/rust/tests/windows_sys_test" ] 7808 + deps += [ "//chromium/build/rust/tests/test_control_flow_guard" ] 7809 } 7810 } 7811 } 7812 diff --git a/rust/tests/bindgen_cpp_test/BUILD.gn b/rust/tests/bindgen_cpp_test/BUILD.gn 7813 index 8532fbed0..2a98ca2ae 100644 7814 --- a/rust/tests/bindgen_cpp_test/BUILD.gn 7815 +++ b/rust/tests/bindgen_cpp_test/BUILD.gn 7816 @@ -2,8 +2,8 @@ 7817 # Use of this source code is governed by a BSD-style license that can be 7818 # found in the LICENSE file. 7819 7820 -import("//build/rust/rust_bindgen.gni") 7821 -import("//build/rust/rust_executable.gni") 7822 +import("//chromium/build/rust/rust_bindgen.gni") 7823 +import("//chromium/build/rust/rust_executable.gni") 7824 7825 source_set("cpp_lib") { 7826 sources = [ 7827 diff --git a/rust/tests/bindgen_cpp_test/main.rs b/rust/tests/bindgen_cpp_test/main.rs 7828 index 66a37572e..9b2cd5838 100644 7829 --- a/rust/tests/bindgen_cpp_test/main.rs 7830 +++ b/rust/tests/bindgen_cpp_test/main.rs 7831 @@ -3,7 +3,7 @@ 7832 // found in the LICENSE file. 7833 7834 chromium::import! { 7835 - "//build/rust/tests/bindgen_cpp_test:cpp_lib_bindgen"; 7836 + "//chromium/build/rust/tests/bindgen_cpp_test:cpp_lib_bindgen"; 7837 } 7838 7839 pub fn main() { 7840 diff --git a/rust/tests/bindgen_cpp_test_with_cpp_linkage/BUILD.gn b/rust/tests/bindgen_cpp_test_with_cpp_linkage/BUILD.gn 7841 index 130d2ae33..d1fee00dd 100644 7842 --- a/rust/tests/bindgen_cpp_test_with_cpp_linkage/BUILD.gn 7843 +++ b/rust/tests/bindgen_cpp_test_with_cpp_linkage/BUILD.gn 7844 @@ -2,8 +2,8 @@ 7845 # Use of this source code is governed by a BSD-style license that can be 7846 # found in the LICENSE file. 7847 7848 -import("//build/rust/rust_bindgen.gni") 7849 -import("//build/rust/rust_static_library.gni") 7850 +import("//chromium/build/rust/rust_bindgen.gni") 7851 +import("//chromium/build/rust/rust_static_library.gni") 7852 7853 source_set("cpp_lib") { 7854 sources = [ 7855 diff --git a/rust/tests/bindgen_cpp_test_with_cpp_linkage/lib.rs b/rust/tests/bindgen_cpp_test_with_cpp_linkage/lib.rs 7856 index 25d80df65..3561ebbae 100644 7857 --- a/rust/tests/bindgen_cpp_test_with_cpp_linkage/lib.rs 7858 +++ b/rust/tests/bindgen_cpp_test_with_cpp_linkage/lib.rs 7859 @@ -3,7 +3,7 @@ 7860 // found in the LICENSE file. 7861 7862 chromium::import! { 7863 - "//build/rust/tests/bindgen_cpp_test_with_cpp_linkage:cpp_lib_bindgen"; 7864 + "//chromium/build/rust/tests/bindgen_cpp_test_with_cpp_linkage:cpp_lib_bindgen"; 7865 } 7866 7867 #[no_mangle] 7868 diff --git a/rust/tests/bindgen_static_fns_test/BUILD.gn b/rust/tests/bindgen_static_fns_test/BUILD.gn 7869 index a07f1add6..47bd590cb 100644 7870 --- a/rust/tests/bindgen_static_fns_test/BUILD.gn 7871 +++ b/rust/tests/bindgen_static_fns_test/BUILD.gn 7872 @@ -2,9 +2,9 @@ 7873 # Use of this source code is governed by a BSD-style license that can be 7874 # found in the LICENSE file. 7875 7876 -import("//build/rust/rust_bindgen.gni") 7877 -import("//build/rust/rust_executable.gni") 7878 -import("//build/rust/rust_static_library.gni") 7879 +import("//chromium/build/rust/rust_bindgen.gni") 7880 +import("//chromium/build/rust/rust_executable.gni") 7881 +import("//chromium/build/rust/rust_static_library.gni") 7882 7883 source_set("c_lib_headers") { 7884 sources = [ "lib.h" ] 7885 diff --git a/rust/tests/bindgen_static_fns_test/main.rs b/rust/tests/bindgen_static_fns_test/main.rs 7886 index 3258345eb..497c73bbf 100644 7887 --- a/rust/tests/bindgen_static_fns_test/main.rs 7888 +++ b/rust/tests/bindgen_static_fns_test/main.rs 7889 @@ -3,7 +3,7 @@ 7890 // found in the LICENSE file. 7891 7892 chromium::import! { 7893 - "//build/rust/tests/bindgen_static_fns_test:bindgen_static_fns_test_lib"; 7894 + "//chromium/build/rust/tests/bindgen_static_fns_test:bindgen_static_fns_test_lib"; 7895 } 7896 7897 use bindgen_static_fns_test_lib::mul_three_numbers_in_c; 7898 diff --git a/rust/tests/bindgen_static_fns_test/src/lib.rs b/rust/tests/bindgen_static_fns_test/src/lib.rs 7899 index 267509f72..041b56c03 100644 7900 --- a/rust/tests/bindgen_static_fns_test/src/lib.rs 7901 +++ b/rust/tests/bindgen_static_fns_test/src/lib.rs 7902 @@ -3,7 +3,7 @@ 7903 // found in the LICENSE file. 7904 7905 chromium::import! { 7906 - "//build/rust/tests/bindgen_static_fns_test:c_lib_bindgen"; 7907 + "//chromium/build/rust/tests/bindgen_static_fns_test:c_lib_bindgen"; 7908 } 7909 7910 pub fn mul_three_numbers_in_c(a: u32, b: u32, c: u32) -> u32 { 7911 diff --git a/rust/tests/bindgen_test/BUILD.gn b/rust/tests/bindgen_test/BUILD.gn 7912 index ab1b9f39e..523c26335 100644 7913 --- a/rust/tests/bindgen_test/BUILD.gn 7914 +++ b/rust/tests/bindgen_test/BUILD.gn 7915 @@ -2,9 +2,9 @@ 7916 # Use of this source code is governed by a BSD-style license that can be 7917 # found in the LICENSE file. 7918 7919 -import("//build/rust/rust_bindgen.gni") 7920 -import("//build/rust/rust_executable.gni") 7921 -import("//build/rust/rust_static_library.gni") 7922 +import("//chromium/build/rust/rust_bindgen.gni") 7923 +import("//chromium/build/rust/rust_executable.gni") 7924 +import("//chromium/build/rust/rust_static_library.gni") 7925 7926 source_set("c_lib_headers") { 7927 sources = [ 7928 diff --git a/rust/tests/bindgen_test/main.rs b/rust/tests/bindgen_test/main.rs 7929 index 0e30fa6c9..f63253ae1 100644 7930 --- a/rust/tests/bindgen_test/main.rs 7931 +++ b/rust/tests/bindgen_test/main.rs 7932 @@ -3,7 +3,7 @@ 7933 // found in the LICENSE file. 7934 7935 chromium::import! { 7936 - "//build/rust/tests/bindgen_test:bindgen_test_lib"; 7937 + "//chromium/build/rust/tests/bindgen_test:bindgen_test_lib"; 7938 } 7939 7940 use bindgen_test_lib::add_two_numbers_in_c; 7941 diff --git a/rust/tests/bindgen_test/src/lib.rs b/rust/tests/bindgen_test/src/lib.rs 7942 index bd6ffafe6..9e51791be 100644 7943 --- a/rust/tests/bindgen_test/src/lib.rs 7944 +++ b/rust/tests/bindgen_test/src/lib.rs 7945 @@ -3,7 +3,7 @@ 7946 // found in the LICENSE file. 7947 7948 chromium::import! { 7949 - "//build/rust/tests/bindgen_test:c_lib_bindgen"; 7950 + "//chromium/build/rust/tests/bindgen_test:c_lib_bindgen"; 7951 } 7952 7953 pub fn add_two_numbers_in_c(a: u32, b: u32) -> u32 { 7954 diff --git a/rust/tests/test_aliased_deps/BUILD.gn b/rust/tests/test_aliased_deps/BUILD.gn 7955 index 98deeb01f..e9c88e328 100644 7956 --- a/rust/tests/test_aliased_deps/BUILD.gn 7957 +++ b/rust/tests/test_aliased_deps/BUILD.gn 7958 @@ -2,9 +2,9 @@ 7959 # Use of this source code is governed by a BSD-style license that can be 7960 # found in the LICENSE file. 7961 7962 -import("//build/config/rust.gni") 7963 -import("//build/rust/rust_executable.gni") 7964 -import("//build/rust/rust_static_library.gni") 7965 +import("//chromium/build/config/rust.gni") 7966 +import("//chromium/build/rust/rust_executable.gni") 7967 +import("//chromium/build/rust/rust_static_library.gni") 7968 7969 rust_executable("test_aliased_deps_exe") { 7970 crate_root = "main.rs" 7971 diff --git a/rust/tests/test_aliased_deps/main.rs b/rust/tests/test_aliased_deps/main.rs 7972 index 2d66598cf..05f7ecc2a 100644 7973 --- a/rust/tests/test_aliased_deps/main.rs 7974 +++ b/rust/tests/test_aliased_deps/main.rs 7975 @@ -3,7 +3,7 @@ 7976 // found in the LICENSE file. 7977 7978 chromium::import! { 7979 - "//build/rust/tests/test_aliased_deps"; 7980 + "//chromium/build/rust/tests/test_aliased_deps"; 7981 } 7982 7983 fn main() { 7984 diff --git a/rust/tests/test_bin_crate/BUILD.gn b/rust/tests/test_bin_crate/BUILD.gn 7985 index 835029cb7..1c6dd5505 100644 7986 --- a/rust/tests/test_bin_crate/BUILD.gn 7987 +++ b/rust/tests/test_bin_crate/BUILD.gn 7988 @@ -2,7 +2,7 @@ 7989 # Use of this source code is governed by a BSD-style license that can be 7990 # found in the LICENSE file. 7991 7992 -import("//build/rust/cargo_crate.gni") 7993 +import("//chromium/build/rust/cargo_crate.gni") 7994 7995 cargo_crate("test_bin_crate") { 7996 crate_type = "bin" 7997 diff --git a/rust/tests/test_build_rs_target_arch_x86/BUILD.gn b/rust/tests/test_build_rs_target_arch_x86/BUILD.gn 7998 index 72d34a7cd..66ae3aa91 100644 7999 --- a/rust/tests/test_build_rs_target_arch_x86/BUILD.gn 8000 +++ b/rust/tests/test_build_rs_target_arch_x86/BUILD.gn 8001 @@ -2,7 +2,7 @@ 8002 # Use of this source code is governed by a BSD-style license that can be 8003 # found in the LICENSE file. 8004 8005 -import("//build/rust/cargo_crate.gni") 8006 +import("//chromium/build/rust/cargo_crate.gni") 8007 8008 cargo_crate("test_build_rs_target_arch_x86") { 8009 crate_name = "test_build_rs_target_arch_x86" 8010 diff --git a/rust/tests/test_control_flow_guard/BUILD.gn b/rust/tests/test_control_flow_guard/BUILD.gn 8011 index 33401219f..8396f0356 100644 8012 --- a/rust/tests/test_control_flow_guard/BUILD.gn 8013 +++ b/rust/tests/test_control_flow_guard/BUILD.gn 8014 @@ -2,7 +2,7 @@ 8015 # Use of this source code is governed by a BSD-style license that can be 8016 # found in the LICENSE file. 8017 8018 -import("//build/rust/rust_executable.gni") 8019 +import("//chromium/build/rust/rust_executable.gni") 8020 8021 rust_executable("test_control_flow_guard") { 8022 allow_unsafe = true 8023 diff --git a/rust/tests/test_cpp_including_rust/BUILD.gn b/rust/tests/test_cpp_including_rust/BUILD.gn 8024 index 3e974fc4a..9a0d98d07 100644 8025 --- a/rust/tests/test_cpp_including_rust/BUILD.gn 8026 +++ b/rust/tests/test_cpp_including_rust/BUILD.gn 8027 @@ -7,7 +7,7 @@ import("//testing/test.gni") 8028 8029 executable("test_cpp_including_rust") { 8030 sources = [ "main.cc" ] 8031 - deps = [ "//build/rust/tests/test_rust_static_library" ] 8032 + deps = [ "//chromium/build/rust/tests/test_rust_static_library" ] 8033 } 8034 8035 test("test_cpp_including_rust_unittests") { 8036 @@ -16,7 +16,7 @@ test("test_cpp_including_rust_unittests") { 8037 "//base", 8038 "//base/allocator:buildflags", 8039 "//base/test:run_all_unittests", 8040 - "//build/rust/tests/test_rust_static_library", 8041 + "//chromium/build/rust/tests/test_rust_static_library", 8042 "//testing/gmock", 8043 "//testing/gtest", 8044 ] 8045 @@ -29,7 +29,7 @@ if (is_component_build) { 8046 "//base", 8047 "//base/allocator:buildflags", 8048 "//base/test:run_all_unittests", 8049 - "//build/rust/tests/test_rust_shared_library", 8050 + "//chromium/build/rust/tests/test_rust_shared_library", 8051 "//testing/gmock", 8052 "//testing/gtest", 8053 ] 8054 diff --git a/rust/tests/test_proc_macro_crate/BUILD.gn b/rust/tests/test_proc_macro_crate/BUILD.gn 8055 index c9b56a423..313b8fd8c 100644 8056 --- a/rust/tests/test_proc_macro_crate/BUILD.gn 8057 +++ b/rust/tests/test_proc_macro_crate/BUILD.gn 8058 @@ -2,7 +2,7 @@ 8059 # Use of this source code is governed by a BSD-style license that can be 8060 # found in the LICENSE file. 8061 8062 -import("//build/rust/cargo_crate.gni") 8063 +import("//chromium/build/rust/cargo_crate.gni") 8064 8065 cargo_crate("test_proc_macro_crate") { 8066 crate_root = "crate/src/lib.rs" 8067 diff --git a/rust/tests/test_proc_macro_crate_2/BUILD.gn b/rust/tests/test_proc_macro_crate_2/BUILD.gn 8068 index 30d1c75b9..6a77e853f 100644 8069 --- a/rust/tests/test_proc_macro_crate_2/BUILD.gn 8070 +++ b/rust/tests/test_proc_macro_crate_2/BUILD.gn 8071 @@ -4,7 +4,7 @@ 8072 8073 # Test another proc macro crate of the same name but different epoch. 8074 8075 -import("//build/rust/cargo_crate.gni") 8076 +import("//chromium/build/rust/cargo_crate.gni") 8077 8078 cargo_crate("test_proc_macro_crate") { 8079 crate_root = "crate/src/lib.rs" 8080 diff --git a/rust/tests/test_rlib_crate/BUILD.gn b/rust/tests/test_rlib_crate/BUILD.gn 8081 index 953cebb24..238b4103f 100644 8082 --- a/rust/tests/test_rlib_crate/BUILD.gn 8083 +++ b/rust/tests/test_rlib_crate/BUILD.gn 8084 @@ -2,7 +2,7 @@ 8085 # Use of this source code is governed by a BSD-style license that can be 8086 # found in the LICENSE file. 8087 8088 -import("//build/rust/cargo_crate.gni") 8089 +import("//chromium/build/rust/cargo_crate.gni") 8090 8091 cargo_crate("target1") { 8092 crate_name = "test_rlib_crate" 8093 diff --git a/rust/tests/test_rlib_crate_testonly/BUILD.gn b/rust/tests/test_rlib_crate_testonly/BUILD.gn 8094 index d24670287..3c680d845 100644 8095 --- a/rust/tests/test_rlib_crate_testonly/BUILD.gn 8096 +++ b/rust/tests/test_rlib_crate_testonly/BUILD.gn 8097 @@ -2,7 +2,7 @@ 8098 # Use of this source code is governed by a BSD-style license that can be 8099 # found in the LICENSE file. 8100 8101 -import("//build/rust/cargo_crate.gni") 8102 +import("//chromium/build/rust/cargo_crate.gni") 8103 8104 cargo_crate("testonly_target") { 8105 testonly = true 8106 diff --git a/rust/tests/test_rs_bindings_from_cc/BUILD.gn b/rust/tests/test_rs_bindings_from_cc/BUILD.gn 8107 index 09830f747..1293051a4 100644 8108 --- a/rust/tests/test_rs_bindings_from_cc/BUILD.gn 8109 +++ b/rust/tests/test_rs_bindings_from_cc/BUILD.gn 8110 @@ -2,8 +2,8 @@ 8111 # Use of this source code is governed by a BSD-style license that can be 8112 # found in the LICENSE file. 8113 8114 -import("//build/rust/rs_bindings_from_cc.gni") 8115 -import("//build/rust/rust_executable.gni") 8116 +import("//chromium/build/rust/rs_bindings_from_cc.gni") 8117 +import("//chromium/build/rust/rust_executable.gni") 8118 8119 rust_executable("test_rs_bindings_from_cc") { 8120 crate_root = "main.rs" 8121 diff --git a/rust/tests/test_rust_calling_cpp/BUILD.gn b/rust/tests/test_rust_calling_cpp/BUILD.gn 8122 index 9fdfcd478..6d8057241 100644 8123 --- a/rust/tests/test_rust_calling_cpp/BUILD.gn 8124 +++ b/rust/tests/test_rust_calling_cpp/BUILD.gn 8125 @@ -1,4 +1,4 @@ 8126 -import("//build/rust/rust_static_library.gni") 8127 +import("//chromium/build/rust/rust_static_library.gni") 8128 8129 static_library("cpp_library") { 8130 sources = [ 8131 diff --git a/rust/tests/test_rust_exe/BUILD.gn b/rust/tests/test_rust_exe/BUILD.gn 8132 index cd8f4a5e0..86d035506 100644 8133 --- a/rust/tests/test_rust_exe/BUILD.gn 8134 +++ b/rust/tests/test_rust_exe/BUILD.gn 8135 @@ -2,16 +2,16 @@ 8136 # Use of this source code is governed by a BSD-style license that can be 8137 # found in the LICENSE file. 8138 8139 -import("//build/rust/rust_executable.gni") 8140 +import("//chromium/build/rust/rust_executable.gni") 8141 8142 rust_executable("test_rust_exe") { 8143 crate_root = "main.rs" 8144 sources = [ "main.rs" ] 8145 deps = [ 8146 - "//build/rust/tests/test_proc_macro_crate", 8147 - "//build/rust/tests/test_rlib_crate:target1", 8148 - "//build/rust/tests/test_rust_static_library", 8149 - "//build/rust/tests/test_rust_static_library_non_standard_arrangement:lib", 8150 + "//chromium/build/rust/tests/test_proc_macro_crate", 8151 + "//chromium/build/rust/tests/test_rlib_crate:target1", 8152 + "//chromium/build/rust/tests/test_rust_static_library", 8153 + "//chromium/build/rust/tests/test_rust_static_library_non_standard_arrangement:lib", 8154 ] 8155 build_native_rust_unit_tests = true 8156 } 8157 diff --git a/rust/tests/test_rust_exe/main.rs b/rust/tests/test_rust_exe/main.rs 8158 index ed6cd073e..ddc83a8a7 100644 8159 --- a/rust/tests/test_rust_exe/main.rs 8160 +++ b/rust/tests/test_rust_exe/main.rs 8161 @@ -3,8 +3,8 @@ 8162 // found in the LICENSE file. 8163 8164 chromium::import! { 8165 - "//build/rust/tests/test_rust_static_library"; 8166 - "//build/rust/tests/test_rust_static_library_non_standard_arrangement:lib" as 8167 + "//chromium/build/rust/tests/test_rust_static_library"; 8168 + "//chromium/build/rust/tests/test_rust_static_library_non_standard_arrangement:lib" as 8169 test_rust_static_library_non_standard_arrangement; 8170 } 8171 8172 diff --git a/rust/tests/test_rust_exe_2/BUILD.gn b/rust/tests/test_rust_exe_2/BUILD.gn 8173 index 31bbacc6a..d612c4143 100644 8174 --- a/rust/tests/test_rust_exe_2/BUILD.gn 8175 +++ b/rust/tests/test_rust_exe_2/BUILD.gn 8176 @@ -2,11 +2,11 @@ 8177 # Use of this source code is governed by a BSD-style license that can be 8178 # found in the LICENSE file. 8179 8180 -import("//build/rust/rust_executable.gni") 8181 +import("//chromium/build/rust/rust_executable.gni") 8182 8183 rust_executable("test_rust_exe_2") { 8184 crate_root = "main.rs" 8185 sources = [ "main.rs" ] 8186 - deps = [ "//build/rust/tests/test_proc_macro_crate_2:test_proc_macro_crate" ] 8187 + deps = [ "//chromium/build/rust/tests/test_proc_macro_crate_2:test_proc_macro_crate" ] 8188 build_native_rust_unit_tests = true 8189 } 8190 diff --git a/rust/tests/test_rust_metadata/BUILD.gn b/rust/tests/test_rust_metadata/BUILD.gn 8191 index 2491879a7..f8e6bba8f 100644 8192 --- a/rust/tests/test_rust_metadata/BUILD.gn 8193 +++ b/rust/tests/test_rust_metadata/BUILD.gn 8194 @@ -2,11 +2,11 @@ 8195 # Use of this source code is governed by a BSD-style license that can be 8196 # found in the LICENSE file. 8197 8198 -import("//build/config/rust.gni") 8199 -import("//build/rust/cargo_crate.gni") 8200 -import("//build/rust/rust_executable.gni") 8201 -import("//build/rust/rust_static_library.gni") 8202 -import("//build/rust/rust_unit_test.gni") 8203 +import("//chromium/build/config/rust.gni") 8204 +import("//chromium/build/rust/cargo_crate.gni") 8205 +import("//chromium/build/rust/rust_executable.gni") 8206 +import("//chromium/build/rust/rust_static_library.gni") 8207 +import("//chromium/build/rust/rust_unit_test.gni") 8208 8209 # This target depends on two variants of the same crate: one directly, and one 8210 # transitively. With correct metadata handling, this will work. 8211 diff --git a/rust/tests/test_rust_metadata/lib.rs b/rust/tests/test_rust_metadata/lib.rs 8212 index bfe2e1b26..23cccef66 100644 8213 --- a/rust/tests/test_rust_metadata/lib.rs 8214 +++ b/rust/tests/test_rust_metadata/lib.rs 8215 @@ -12,7 +12,7 @@ 8216 extern crate transitive_dep; 8217 8218 chromium::import! { 8219 - "//build/rust/tests/test_rust_metadata:foo_dependency"; 8220 + "//chromium/build/rust/tests/test_rust_metadata:foo_dependency"; 8221 } 8222 8223 pub use foo_dependency::say_foo; 8224 diff --git a/rust/tests/test_rust_metadata/main.rs b/rust/tests/test_rust_metadata/main.rs 8225 index 451910f03..579fa74a6 100644 8226 --- a/rust/tests/test_rust_metadata/main.rs 8227 +++ b/rust/tests/test_rust_metadata/main.rs 8228 @@ -3,7 +3,7 @@ 8229 // found in the LICENSE file. 8230 8231 chromium::import! { 8232 - "//build/rust/tests/test_rust_metadata:lib"; 8233 + "//chromium/build/rust/tests/test_rust_metadata:lib"; 8234 } 8235 8236 fn main() { 8237 diff --git a/rust/tests/test_rust_metadata/tests.rs b/rust/tests/test_rust_metadata/tests.rs 8238 index 4dd9199df..1c442de17 100644 8239 --- a/rust/tests/test_rust_metadata/tests.rs 8240 +++ b/rust/tests/test_rust_metadata/tests.rs 8241 @@ -3,7 +3,7 @@ 8242 // found in the LICENSE file. 8243 8244 chromium::import! { 8245 - "//build/rust/tests/test_rust_metadata:lib"; 8246 + "//chromium/build/rust/tests/test_rust_metadata:lib"; 8247 } 8248 8249 #[test] 8250 diff --git a/rust/tests/test_rust_multiple_dep_versions_exe/BUILD.gn b/rust/tests/test_rust_multiple_dep_versions_exe/BUILD.gn 8251 index 4ebccae5f..384bb4a39 100644 8252 --- a/rust/tests/test_rust_multiple_dep_versions_exe/BUILD.gn 8253 +++ b/rust/tests/test_rust_multiple_dep_versions_exe/BUILD.gn 8254 @@ -2,8 +2,8 @@ 8255 # Use of this source code is governed by a BSD-style license that can be 8256 # found in the LICENSE file. 8257 8258 -import("//build/rust/rust_executable.gni") 8259 -import("//build/rust/rust_static_library.gni") 8260 +import("//chromium/build/rust/rust_executable.gni") 8261 +import("//chromium/build/rust/rust_static_library.gni") 8262 8263 # The exe depends on lib v1. But it also transitively depends on lib v2. 8264 # The code in the exe should use v1, and the code in the transitive lib should 8265 @@ -13,7 +13,7 @@ rust_executable("test_rust_multiple_dep_versions_exe") { 8266 sources = [ "main.rs" ] 8267 deps = [ 8268 ":transitive_v2", 8269 - "//build/rust/tests/test_rust_multiple_dep_versions_exe/v1:test_lib", 8270 + "//chromium/build/rust/tests/test_rust_multiple_dep_versions_exe/v1:test_lib", 8271 ] 8272 } 8273 8274 @@ -21,5 +21,5 @@ rust_static_library("transitive_v2") { 8275 crate_root = "transitive_lib.rs" 8276 sources = [ "transitive_lib.rs" ] 8277 deps = 8278 - [ "//build/rust/tests/test_rust_multiple_dep_versions_exe/v2:test_lib" ] 8279 + [ "//chromium/build/rust/tests/test_rust_multiple_dep_versions_exe/v2:test_lib" ] 8280 } 8281 diff --git a/rust/tests/test_rust_multiple_dep_versions_exe/main.rs b/rust/tests/test_rust_multiple_dep_versions_exe/main.rs 8282 index fdf730dfe..63d84f204 100644 8283 --- a/rust/tests/test_rust_multiple_dep_versions_exe/main.rs 8284 +++ b/rust/tests/test_rust_multiple_dep_versions_exe/main.rs 8285 @@ -3,7 +3,7 @@ 8286 // found in the LICENSE file. 8287 8288 chromium::import! { 8289 - "//build/rust/tests/test_rust_multiple_dep_versions_exe:transitive_v2"; 8290 + "//chromium/build/rust/tests/test_rust_multiple_dep_versions_exe:transitive_v2"; 8291 } 8292 8293 // To mimic third-party, the `test_lib` crate has a short name which does not 8294 diff --git a/rust/tests/test_rust_multiple_dep_versions_exe/v1/BUILD.gn b/rust/tests/test_rust_multiple_dep_versions_exe/v1/BUILD.gn 8295 index 5532b77ce..12ddf96d5 100644 8296 --- a/rust/tests/test_rust_multiple_dep_versions_exe/v1/BUILD.gn 8297 +++ b/rust/tests/test_rust_multiple_dep_versions_exe/v1/BUILD.gn 8298 @@ -2,7 +2,7 @@ 8299 # Use of this source code is governed by a BSD-style license that can be 8300 # found in the LICENSE file. 8301 8302 -import("//build/rust/cargo_crate.gni") 8303 +import("//chromium/build/rust/cargo_crate.gni") 8304 8305 cargo_crate("test_lib") { 8306 crate_name = "test_lib" 8307 diff --git a/rust/tests/test_rust_multiple_dep_versions_exe/v2/BUILD.gn b/rust/tests/test_rust_multiple_dep_versions_exe/v2/BUILD.gn 8308 index bda02c537..9239fe9ce 100644 8309 --- a/rust/tests/test_rust_multiple_dep_versions_exe/v2/BUILD.gn 8310 +++ b/rust/tests/test_rust_multiple_dep_versions_exe/v2/BUILD.gn 8311 @@ -2,7 +2,7 @@ 8312 # Use of this source code is governed by a BSD-style license that can be 8313 # found in the LICENSE file. 8314 8315 -import("//build/rust/cargo_crate.gni") 8316 +import("//chromium/build/rust/cargo_crate.gni") 8317 8318 cargo_crate("test_lib") { 8319 crate_name = "test_lib" 8320 diff --git a/rust/tests/test_rust_shared_library/BUILD.gn b/rust/tests/test_rust_shared_library/BUILD.gn 8321 index f2396c761..1ef92d4d3 100644 8322 --- a/rust/tests/test_rust_shared_library/BUILD.gn 8323 +++ b/rust/tests/test_rust_shared_library/BUILD.gn 8324 @@ -2,7 +2,7 @@ 8325 # Use of this source code is governed by a BSD-style license that can be 8326 # found in the LICENSE file. 8327 8328 -import("//build/rust/rust_shared_library.gni") 8329 +import("//chromium/build/rust/rust_shared_library.gni") 8330 8331 rust_shared_library("test_rust_shared_library") { 8332 allow_unsafe = true 8333 diff --git a/rust/tests/test_rust_static_library/BUILD.gn b/rust/tests/test_rust_static_library/BUILD.gn 8334 index 28a48cbc1..635137d43 100644 8335 --- a/rust/tests/test_rust_static_library/BUILD.gn 8336 +++ b/rust/tests/test_rust_static_library/BUILD.gn 8337 @@ -2,7 +2,7 @@ 8338 # Use of this source code is governed by a BSD-style license that can be 8339 # found in the LICENSE file. 8340 8341 -import("//build/rust/rust_static_library.gni") 8342 +import("//chromium/build/rust/rust_static_library.gni") 8343 8344 rust_static_library("test_rust_static_library") { 8345 allow_unsafe = true 8346 diff --git a/rust/tests/test_rust_static_library_non_standard_arrangement/BUILD.gn b/rust/tests/test_rust_static_library_non_standard_arrangement/BUILD.gn 8347 index 8f1a6c0e8..9deb02c25 100644 8348 --- a/rust/tests/test_rust_static_library_non_standard_arrangement/BUILD.gn 8349 +++ b/rust/tests/test_rust_static_library_non_standard_arrangement/BUILD.gn 8350 @@ -2,7 +2,7 @@ 8351 # Use of this source code is governed by a BSD-style license that can be 8352 # found in the LICENSE file. 8353 8354 -import("//build/rust/rust_static_library.gni") 8355 +import("//chromium/build/rust/rust_static_library.gni") 8356 8357 rust_static_library("lib") { 8358 sources = [ "foo.rs" ] 8359 diff --git a/rust/tests/test_rust_unittests/BUILD.gn b/rust/tests/test_rust_unittests/BUILD.gn 8360 index bdc1f84a6..0f4db60a2 100644 8361 --- a/rust/tests/test_rust_unittests/BUILD.gn 8362 +++ b/rust/tests/test_rust_unittests/BUILD.gn 8363 @@ -2,10 +2,10 @@ 8364 # Use of this source code is governed by a BSD-style license that can be 8365 # found in the LICENSE file. 8366 8367 -import("//build/rust/rust_unit_test.gni") 8368 +import("//chromium/build/rust/rust_unit_test.gni") 8369 8370 rust_unit_test("test_rust_unittests") { 8371 sources = [ "main.rs" ] 8372 crate_root = "main.rs" 8373 - deps = [ "//build/rust/tests/test_rust_static_library" ] 8374 + deps = [ "//chromium/build/rust/tests/test_rust_static_library" ] 8375 } 8376 diff --git a/rust/tests/test_rust_unittests/main.rs b/rust/tests/test_rust_unittests/main.rs 8377 index 236a8e7cb..180bfcf7a 100644 8378 --- a/rust/tests/test_rust_unittests/main.rs 8379 +++ b/rust/tests/test_rust_unittests/main.rs 8380 @@ -3,7 +3,7 @@ 8381 // found in the LICENSE file. 8382 8383 chromium::import! { 8384 - "//build/rust/tests/test_rust_static_library"; 8385 + "//chromium/build/rust/tests/test_rust_static_library"; 8386 } 8387 8388 use test_rust_static_library::add_two_ints_via_rust; 8389 diff --git a/rust/tests/test_serde_json_lenient/BUILD.gn b/rust/tests/test_serde_json_lenient/BUILD.gn 8390 index 83284dfb3..2133e17df 100644 8391 --- a/rust/tests/test_serde_json_lenient/BUILD.gn 8392 +++ b/rust/tests/test_serde_json_lenient/BUILD.gn 8393 @@ -2,7 +2,7 @@ 8394 # Use of this source code is governed by a BSD-style license that can be 8395 # found in the LICENSE file. 8396 8397 -import("//build/rust/rust_static_library.gni") 8398 +import("//chromium/build/rust/rust_static_library.gni") 8399 import("//testing/test.gni") 8400 8401 rust_static_library("test_serde_json_lenient_rs") { 8402 diff --git a/rust/tests/test_simple_rust_exe/BUILD.gn b/rust/tests/test_simple_rust_exe/BUILD.gn 8403 index 9d4dcf71e..1f1ad06dd 100644 8404 --- a/rust/tests/test_simple_rust_exe/BUILD.gn 8405 +++ b/rust/tests/test_simple_rust_exe/BUILD.gn 8406 @@ -9,5 +9,5 @@ 8407 executable("test_simple_rust_exe") { 8408 crate_root = "main.rs" 8409 sources = [ crate_root ] 8410 - deps = [ "//build/rust/std" ] 8411 + deps = [ "//chromium/build/rust/std" ] 8412 } 8413 diff --git a/rust/tests/windows_sys_test/BUILD.gn b/rust/tests/windows_sys_test/BUILD.gn 8414 index a67e0926d..b7dad1285 100644 8415 --- a/rust/tests/windows_sys_test/BUILD.gn 8416 +++ b/rust/tests/windows_sys_test/BUILD.gn 8417 @@ -2,9 +2,9 @@ 8418 # Use of this source code is governed by a BSD-style license that can be 8419 # found in the LICENSE file. 8420 8421 -import("//build/rust/rust_bindgen.gni") 8422 -import("//build/rust/rust_executable.gni") 8423 -import("//build/rust/rust_static_library.gni") 8424 +import("//chromium/build/rust/rust_bindgen.gni") 8425 +import("//chromium/build/rust/rust_executable.gni") 8426 +import("//chromium/build/rust/rust_static_library.gni") 8427 8428 rust_executable("windows_sys_test") { 8429 allow_unsafe = true # Calls FFI. 8430 diff --git a/symlink.gni b/symlink.gni 8431 index 96b917789..218742b36 100644 8432 --- a/symlink.gni 8433 +++ b/symlink.gni 8434 @@ -16,7 +16,7 @@ template("symlink") { 8435 "visibility", 8436 ]) 8437 outputs = [ invoker.output ] 8438 - script = "//build/symlink.py" 8439 + script = "//chromium/build/symlink.py" 8440 args = [ 8441 "-f", 8442 rebase_path(invoker.source, get_path_info(invoker.output, "dir")), 8443 diff --git a/timestamp.gni b/timestamp.gni 8444 index b9b57d9dd..5c6136174 100644 8445 --- a/timestamp.gni 8446 +++ b/timestamp.gni 8447 @@ -4,7 +4,7 @@ 8448 # 8449 # Defines the build_timestamp variable. 8450 8451 -import("//build/util/lastchange.gni") 8452 +import("//chromium/build/util/lastchange.gni") 8453 8454 declare_args() { 8455 # This should be the filename of a script that prints a single line 8456 diff --git a/toolchain/BUILD.gn b/toolchain/BUILD.gn 8457 index d3a608e49..6a38b326d 100644 8458 --- a/toolchain/BUILD.gn 8459 +++ b/toolchain/BUILD.gn 8460 @@ -2,8 +2,8 @@ 8461 # Use of this source code is governed by a BSD-style license that can be 8462 # found in the LICENSE file. 8463 8464 -import("//build/toolchain/concurrent_links.gni") 8465 -import("//build/toolchain/rbe.gni") 8466 +import("//chromium/build/toolchain/concurrent_links.gni") 8467 +import("//chromium/build/toolchain/rbe.gni") 8468 8469 declare_args() { 8470 # Pool for non remote tasks. 8471 diff --git a/toolchain/aix/BUILD.gn b/toolchain/aix/BUILD.gn 8472 index 71e4de29b..1f8132a8d 100644 8473 --- a/toolchain/aix/BUILD.gn 8474 +++ b/toolchain/aix/BUILD.gn 8475 @@ -2,7 +2,7 @@ 8476 # Use of this source code is governed by a BSD-style license that can be 8477 # found in the LICENSE file. 8478 8479 -import("//build/toolchain/gcc_toolchain.gni") 8480 +import("//chromium/build/toolchain/gcc_toolchain.gni") 8481 8482 gcc_toolchain("ppc64") { 8483 cc = "gcc" 8484 diff --git a/toolchain/android/BUILD.gn b/toolchain/android/BUILD.gn 8485 index 44b94033f..5bba14cad 100644 8486 --- a/toolchain/android/BUILD.gn 8487 +++ b/toolchain/android/BUILD.gn 8488 @@ -2,13 +2,13 @@ 8489 # Use of this source code is governed by a BSD-style license that can be 8490 # found in the LICENSE file. 8491 8492 -import("//build/config/android/config.gni") 8493 -import("//build/config/chrome_build.gni") 8494 -import("//build/config/clang/clang.gni") 8495 -import("//build/config/compiler/compiler.gni") 8496 -import("//build/config/ozone.gni") 8497 -import("//build/config/sysroot.gni") # Imports android/config.gni. 8498 -import("//build/toolchain/gcc_toolchain.gni") 8499 +import("//chromium/build/config/android/config.gni") 8500 +import("//chromium/build/config/chrome_build.gni") 8501 +import("//chromium/build/config/clang/clang.gni") 8502 +import("//chromium/build/config/compiler/compiler.gni") 8503 +import("//chromium/build/config/ozone.gni") 8504 +import("//chromium/build/config/sysroot.gni") # Imports android/config.gni. 8505 +import("//chromium/build/toolchain/gcc_toolchain.gni") 8506 if (build_with_chromium) { 8507 import("//third_party/jni_zero/jni_zero.gni") 8508 } 8509 diff --git a/toolchain/android/DIR_METADATA b/toolchain/android/DIR_METADATA 8510 index cdc2d6fb6..37c98f5e4 100644 8511 --- a/toolchain/android/DIR_METADATA 8512 +++ b/toolchain/android/DIR_METADATA 8513 @@ -1 +1 @@ 8514 -mixins: "//build/android/COMMON_METADATA" 8515 +mixins: "//chromium/build/android/COMMON_METADATA" 8516 diff --git a/toolchain/apple/BUILD.gn b/toolchain/apple/BUILD.gn 8517 index 04d592016..ed81c27b5 100644 8518 --- a/toolchain/apple/BUILD.gn 8519 +++ b/toolchain/apple/BUILD.gn 8520 @@ -2,7 +2,7 @@ 8521 # Use of this source code is governed by a BSD-style license that can be 8522 # found in the LICENSE file. 8523 8524 -import("//build/toolchain/concurrent_links.gni") 8525 +import("//chromium/build/toolchain/concurrent_links.gni") 8526 8527 declare_args() { 8528 # Reduce the number of tasks using the copy_bundle_data and compile_xcassets 8529 diff --git a/toolchain/apple/toolchain.gni b/toolchain/apple/toolchain.gni 8530 index 384375fbd..8c3de67a1 100644 8531 --- a/toolchain/apple/toolchain.gni 8532 +++ b/toolchain/apple/toolchain.gni 8533 @@ -6,14 +6,14 @@ 8534 # some enhancements since the commands on Mac are slightly different than on 8535 # Linux. 8536 8537 -import("//build/config/apple/symbols.gni") 8538 -import("//build/config/clang/clang.gni") 8539 -import("//build/config/compiler/compiler.gni") 8540 -import("//build/config/coverage/coverage.gni") 8541 -import("//build/config/rust.gni") 8542 -import("//build/toolchain/cc_wrapper.gni") 8543 -import("//build/toolchain/rbe.gni") 8544 -import("//build/toolchain/toolchain.gni") 8545 +import("//chromium/build/config/apple/symbols.gni") 8546 +import("//chromium/build/config/clang/clang.gni") 8547 +import("//chromium/build/config/compiler/compiler.gni") 8548 +import("//chromium/build/config/coverage/coverage.gni") 8549 +import("//chromium/build/config/rust.gni") 8550 +import("//chromium/build/toolchain/cc_wrapper.gni") 8551 +import("//chromium/build/toolchain/rbe.gni") 8552 +import("//chromium/build/toolchain/toolchain.gni") 8553 import("//build_overrides/build.gni") 8554 8555 # TODO(crbug.com/40869822): This import is required to detect whether the 8556 @@ -21,8 +21,8 @@ import("//build_overrides/build.gni") 8557 # swift compiler (as it does not include support for catalyst). Remove it 8558 # once the support is available. 8559 if (is_ios) { 8560 - import("//build/config/apple/mobile_config.gni") 8561 - import("//build/config/ios/ios_sdk.gni") 8562 + import("//chromium/build/config/apple/mobile_config.gni") 8563 + import("//chromium/build/config/ios/ios_sdk.gni") 8564 } 8565 8566 assert((target_os == "ios" && host_os == "mac") || host_os != "win") 8567 @@ -84,11 +84,11 @@ tool_versions = exec_script( 8568 "get_tool_mtime.py", 8569 rebase_path( 8570 [ 8571 - "//build/toolchain/apple/compile_xcassets.py", 8572 - "//build/toolchain/apple/filter_libtool.py", 8573 - "//build/toolchain/apple/linker_driver.py", 8574 - "//build/toolchain/apple/swift_const_gather_protocols.json", 8575 - "//build/toolchain/apple/swiftc.py", 8576 + "//chromium/build/toolchain/apple/compile_xcassets.py", 8577 + "//chromium/build/toolchain/apple/filter_libtool.py", 8578 + "//chromium/build/toolchain/apple/linker_driver.py", 8579 + "//chromium/build/toolchain/apple/swift_const_gather_protocols.json", 8580 + "//chromium/build/toolchain/apple/swiftc.py", 8581 ], 8582 root_build_dir), 8583 "trim scope") 8584 @@ -196,7 +196,7 @@ template("single_apple_toolchain") { 8585 toolchain_coverage_instrumentation_input_file != "" 8586 if (_use_clang_coverage_wrapper) { 8587 _coverage_wrapper = 8588 - rebase_path("//build/toolchain/clang_code_coverage_wrapper.py", 8589 + rebase_path("//chromium/build/toolchain/clang_code_coverage_wrapper.py", 8590 root_build_dir) + " --files-to-instrument=" + 8591 rebase_path(toolchain_coverage_instrumentation_input_file, 8592 root_build_dir) + " --target-os=" + target_os 8593 @@ -206,7 +206,7 @@ template("single_apple_toolchain") { 8594 8595 linker_driver_env = "TOOL_VERSION=${tool_versions.linker_driver}" 8596 linker_driver = 8597 - rebase_path("//build/toolchain/apple/linker_driver.py", root_build_dir) 8598 + rebase_path("//chromium/build/toolchain/apple/linker_driver.py", root_build_dir) 8599 linker_driver_args = "-Wcrl,driver,$ld" 8600 8601 # Specify an explicit path for the strip binary. 8602 @@ -255,7 +255,7 @@ template("single_apple_toolchain") { 8603 rustc_bin = "$rust_sysroot_relative/bin/rustc" 8604 rustc = "$rust_compiler_prefix${rustc_bin}" 8605 rustc_wrapper = 8606 - rebase_path("//build/rust/rustc_wrapper.py", root_build_dir) 8607 + rebase_path("//chromium/build/rust/rustc_wrapper.py", root_build_dir) 8608 8609 tool("rust_staticlib") { 8610 libname = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8611 @@ -310,7 +310,7 @@ template("single_apple_toolchain") { 8612 exename = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8613 rspfile = "$exename.rsp" 8614 depfile = "$exename.d" 8615 - pool = "//build/toolchain:link_pool($default_toolchain)" 8616 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8617 8618 # TODO(danakj): solink can generate TOC files for re-exporting library 8619 # symbols, and we should do the same here. 8620 @@ -337,7 +337,7 @@ template("single_apple_toolchain") { 8621 dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8622 rspfile = "$dllname.rsp" 8623 depfile = "$dllname.d" 8624 - pool = "//build/toolchain:link_pool($default_toolchain)" 8625 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8626 8627 # TODO(danakj): solink can generate TOC files for re-exporting library 8628 # symbols, and we should do the same here. 8629 @@ -366,7 +366,7 @@ template("single_apple_toolchain") { 8630 dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8631 rspfile = "$dllname.rsp" 8632 depfile = "$dllname.d" 8633 - pool = "//build/toolchain:link_pool($default_toolchain)" 8634 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8635 8636 # TODO(danakj): solink can generate TOC files for re-exporting library 8637 # symbols, and we should do the same here. 8638 @@ -451,7 +451,7 @@ template("single_apple_toolchain") { 8639 rspfile_content = "{{inputs}}" 8640 8641 if (!toolchain_uses_lld) { 8642 - script = rebase_path("//build/toolchain/apple/filter_libtool.py", 8643 + script = rebase_path("//chromium/build/toolchain/apple/filter_libtool.py", 8644 root_build_dir) 8645 8646 # Specify explicit path for libtool. 8647 @@ -477,7 +477,7 @@ template("single_apple_toolchain") { 8648 # E.g. "./libfoo.dylib": 8649 dylib = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8650 rspfile = dylib + ".rsp" 8651 - pool = "//build/toolchain:link_pool($default_toolchain)" 8652 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8653 8654 # These variables are not built into GN but are helpers that implement 8655 # (1) linking to produce a .dylib, (2) extracting the symbols from that 8656 @@ -552,7 +552,7 @@ template("single_apple_toolchain") { 8657 # E.g. "./libfoo.so": 8658 sofile = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8659 rspfile = sofile + ".rsp" 8660 - pool = "//build/toolchain:link_pool($default_toolchain)" 8661 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8662 8663 link_command = "$linker_driver_env $linker_driver $linker_driver_args -bundle {{ldflags}} -o \"$sofile\" \"@$rspfile\" {{rlibs}}" 8664 link_command += dsym_switch 8665 @@ -582,7 +582,7 @@ template("single_apple_toolchain") { 8666 tool("link") { 8667 outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8668 rspfile = "$outfile.rsp" 8669 - pool = "//build/toolchain:link_pool($default_toolchain)" 8670 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8671 8672 command = "$linker_driver_env $linker_driver $linker_driver_args $dsym_switch {{ldflags}} -o \"$outfile\" \"@$rspfile\" {{rlibs}}" 8673 description = "LINK $outfile" 8674 @@ -627,7 +627,7 @@ template("single_apple_toolchain") { 8675 command = "rm -rf {{output}} && /bin/cp -Rld {{source}} {{output}}" 8676 } 8677 description = "COPY_BUNDLE_DATA {{source}} {{output}}" 8678 - pool = "//build/toolchain/apple:bundle_pool($default_toolchain)" 8679 + pool = "//chromium/build/toolchain/apple:bundle_pool($default_toolchain)" 8680 } 8681 8682 # Swift is only used on iOS, not macOS. We want to minimize the number 8683 @@ -635,7 +635,7 @@ template("single_apple_toolchain") { 8684 # disallow future uses of Swift on macOS. https://crbug.com/965663. 8685 if (toolchain_args.current_os == "ios") { 8686 tool("swift") { 8687 - _tool = rebase_path("//build/toolchain/apple/swiftc.py", root_build_dir) 8688 + _tool = rebase_path("//chromium/build/toolchain/apple/swiftc.py", root_build_dir) 8689 8690 depfile = "{{target_out_dir}}/{{module_name}}.d" 8691 depsformat = "gcc" 8692 @@ -752,7 +752,7 @@ template("single_apple_toolchain") { 8693 _src_dir = rebase_path("//", root_build_dir) 8694 _gen_dir = rebase_path(root_gen_dir, root_build_dir) 8695 _const_gather_protocols_file = rebase_path( 8696 - "//build/toolchain/apple/swift_const_gather_protocols.json", 8697 + "//chromium/build/toolchain/apple/swift_const_gather_protocols.json", 8698 root_build_dir) 8699 8700 command = 8701 @@ -772,7 +772,7 @@ template("single_apple_toolchain") { 8702 # disallow future uses of xcassets on macOS. https://crbug.com/965663. 8703 if (toolchain_args.current_os == "ios") { 8704 tool("compile_xcassets") { 8705 - _tool = rebase_path("//build/toolchain/apple/compile_xcassets.py", 8706 + _tool = rebase_path("//chromium/build/toolchain/apple/compile_xcassets.py", 8707 root_build_dir) 8708 8709 _env_vars = "TOOL_VERSION=${tool_versions.compile_xcassets}" 8710 @@ -789,12 +789,12 @@ template("single_apple_toolchain") { 8711 " {{xcasset_compiler_flags}} " + "-o {{output}} {{inputs}}" 8712 8713 description = "COMPILE_XCASSETS {{output}}" 8714 - pool = "//build/toolchain/apple:bundle_pool($default_toolchain)" 8715 + pool = "//chromium/build/toolchain/apple:bundle_pool($default_toolchain)" 8716 } 8717 } 8718 8719 tool("action") { 8720 - pool = "//build/toolchain:action_pool($default_toolchain)" 8721 + pool = "//chromium/build/toolchain:action_pool($default_toolchain)" 8722 } 8723 } 8724 } 8725 diff --git a/toolchain/cc_wrapper.gni b/toolchain/cc_wrapper.gni 8726 index b9b558a8a..27ef02a09 100644 8727 --- a/toolchain/cc_wrapper.gni 8728 +++ b/toolchain/cc_wrapper.gni 8729 @@ -2,7 +2,7 @@ 8730 # Use of this source code is governed by a BSD-style license that can be 8731 # found in the LICENSE file. 8732 8733 -import("//build/toolchain/rbe.gni") 8734 +import("//chromium/build/toolchain/rbe.gni") 8735 8736 # Defines the configuration of cc wrapper 8737 # ccache, sccache: c/c++ compiler caches which can greatly reduce recompilation 8738 diff --git a/toolchain/concurrent_links.gni b/toolchain/concurrent_links.gni 8739 index b34b0d2cf..d5bc86aa6 100644 8740 --- a/toolchain/concurrent_links.gni 8741 +++ b/toolchain/concurrent_links.gni 8742 @@ -7,13 +7,13 @@ 8743 # in the context of the default_toolchain, so we can at least check for that. 8744 assert(current_toolchain == default_toolchain) 8745 8746 -import("//build/config/android/config.gni") 8747 -import("//build/config/apple/symbols.gni") 8748 -import("//build/config/chromeos/ui_mode.gni") 8749 -import("//build/config/compiler/compiler.gni") 8750 -import("//build/config/coverage/coverage.gni") 8751 -import("//build/config/sanitizers/sanitizers.gni") 8752 -import("//build/toolchain/toolchain.gni") 8753 +import("//chromium/build/config/android/config.gni") 8754 +import("//chromium/build/config/apple/symbols.gni") 8755 +import("//chromium/build/config/chromeos/ui_mode.gni") 8756 +import("//chromium/build/config/compiler/compiler.gni") 8757 +import("//chromium/build/config/coverage/coverage.gni") 8758 +import("//chromium/build/config/sanitizers/sanitizers.gni") 8759 +import("//chromium/build/toolchain/toolchain.gni") 8760 8761 declare_args() { 8762 # Limit the number of concurrent links; we often want to run fewer 8763 diff --git a/toolchain/cros/BUILD.gn b/toolchain/cros/BUILD.gn 8764 index 293b3e27b..a25f18b66 100644 8765 --- a/toolchain/cros/BUILD.gn 8766 +++ b/toolchain/cros/BUILD.gn 8767 @@ -2,11 +2,11 @@ 8768 # Use of this source code is governed by a BSD-style license that can be 8769 # found in the LICENSE file. 8770 8771 -import("//build/config/compiler/compiler.gni") 8772 -import("//build/config/sysroot.gni") 8773 -import("//build/toolchain/cros/cros_config.gni") 8774 -import("//build/toolchain/cros_toolchain.gni") 8775 -import("//build/toolchain/gcc_toolchain.gni") 8776 +import("//chromium/build/config/compiler/compiler.gni") 8777 +import("//chromium/build/config/sysroot.gni") 8778 +import("//chromium/build/toolchain/cros/cros_config.gni") 8779 +import("//chromium/build/toolchain/cros_toolchain.gni") 8780 +import("//chromium/build/toolchain/gcc_toolchain.gni") 8781 8782 # This is mostly identical to gcc_toolchain, but handles relativizing toolchain 8783 # paths. This is needed for CrOS since these paths often change based on the 8784 diff --git a/toolchain/cros_toolchain.gni b/toolchain/cros_toolchain.gni 8785 index c1fb4e2d6..279aac905 100644 8786 --- a/toolchain/cros_toolchain.gni 8787 +++ b/toolchain/cros_toolchain.gni 8788 @@ -31,8 +31,8 @@ 8789 # cros_target_ar = "x86_64-cros-linux-gnu-gcc-ar" 8790 # target_cpu = "x64" 8791 8792 -import("//build/config/clang/clang.gni") 8793 -import("//build/config/compiler/compiler.gni") 8794 +import("//chromium/build/config/clang/clang.gni") 8795 +import("//chromium/build/config/compiler/compiler.gni") 8796 8797 declare_args() { 8798 # These must be specified for a board-specific build. 8799 diff --git a/toolchain/fuchsia/BUILD.gn b/toolchain/fuchsia/BUILD.gn 8800 index 63504ea70..4040aa762 100644 8801 --- a/toolchain/fuchsia/BUILD.gn 8802 +++ b/toolchain/fuchsia/BUILD.gn 8803 @@ -2,7 +2,7 @@ 8804 # Use of this source code is governed by a BSD-style license that can be 8805 # found in the LICENSE file. 8806 8807 -import("//build/toolchain/gcc_toolchain.gni") 8808 +import("//chromium/build/toolchain/gcc_toolchain.gni") 8809 8810 # Fuchsia builds using the Clang toolchain, with most parameters common across 8811 # the different target architectures. 8812 diff --git a/toolchain/fuchsia/DIR_METADATA b/toolchain/fuchsia/DIR_METADATA 8813 index 210aa6a95..ddd134a2b 100644 8814 --- a/toolchain/fuchsia/DIR_METADATA 8815 +++ b/toolchain/fuchsia/DIR_METADATA 8816 @@ -1 +1 @@ 8817 -mixins: "//build/fuchsia/COMMON_METADATA" 8818 +mixins: "//chromium/build/fuchsia/COMMON_METADATA" 8819 diff --git a/toolchain/gcc_toolchain.gni b/toolchain/gcc_toolchain.gni 8820 index 9cad09923..b18f3e5cb 100644 8821 --- a/toolchain/gcc_toolchain.gni 8822 +++ b/toolchain/gcc_toolchain.gni 8823 @@ -2,22 +2,22 @@ 8824 # Use of this source code is governed by a BSD-style license that can be 8825 # found in the LICENSE file. 8826 8827 -import("//build/config/clang/clang.gni") 8828 -import("//build/config/compiler/compiler.gni") 8829 -import("//build/config/coverage/coverage.gni") 8830 -import("//build/config/rust.gni") 8831 -import("//build/config/sanitizers/sanitizers.gni") 8832 -import("//build/config/sysroot.gni") 8833 -import("//build/config/v8_target_cpu.gni") 8834 -import("//build/toolchain/cc_wrapper.gni") 8835 -import("//build/toolchain/rbe.gni") 8836 -import("//build/toolchain/toolchain.gni") 8837 +import("//chromium/build/config/clang/clang.gni") 8838 +import("//chromium/build/config/compiler/compiler.gni") 8839 +import("//chromium/build/config/coverage/coverage.gni") 8840 +import("//chromium/build/config/rust.gni") 8841 +import("//chromium/build/config/sanitizers/sanitizers.gni") 8842 +import("//chromium/build/config/sysroot.gni") 8843 +import("//chromium/build/config/v8_target_cpu.gni") 8844 +import("//chromium/build/toolchain/cc_wrapper.gni") 8845 +import("//chromium/build/toolchain/rbe.gni") 8846 +import("//chromium/build/toolchain/toolchain.gni") 8847 8848 if (is_nacl) { 8849 # To keep NaCl variables out of builds that don't include NaCl, all 8850 # variables defined in nacl/config.gni referenced here should be protected by 8851 # is_nacl conditions. 8852 - import("//build/config/nacl/config.gni") 8853 + import("//chromium/build/config/nacl/config.gni") 8854 } 8855 8856 declare_args() { 8857 @@ -230,7 +230,7 @@ template("single_gcc_toolchain") { 8858 } 8859 8860 _coverage_wrapper = 8861 - rebase_path("//build/toolchain/clang_code_coverage_wrapper.py", 8862 + rebase_path("//chromium/build/toolchain/clang_code_coverage_wrapper.py", 8863 root_build_dir) 8864 8865 # The wrapper needs to know what OS we target because it uses that to 8866 @@ -391,7 +391,7 @@ template("single_gcc_toolchain") { 8867 # existing file. 8868 if (host_os == "win") { 8869 tool_wrapper_path = 8870 - rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) 8871 + rebase_path("//chromium/build/toolchain/win/tool_wrapper.py", root_build_dir) 8872 command = "cmd /s /c \"\"$python_path\" $tool_wrapper_path delete-file {{output}} && $command\"" 8873 } else { 8874 command = "rm -f {{output}} && $command" 8875 @@ -414,7 +414,7 @@ template("single_gcc_toolchain") { 8876 sofile = "{{output_dir}}/$soname" # Possibly including toolchain dir. 8877 rspfile = sofile + ".rsp" 8878 8879 - pool = "//build/toolchain:link_pool($default_toolchain)" 8880 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8881 8882 if (defined(invoker.strip)) { 8883 unstripped_sofile = "{{root_out_dir}}/lib.unstripped/$soname" 8884 @@ -455,7 +455,7 @@ template("single_gcc_toolchain") { 8885 # requiring sh control structures, pipelines, and POSIX utilities. 8886 # The host might not have a POSIX shell and utilities (e.g. Windows). 8887 solink_wrapper = 8888 - rebase_path("//build/toolchain/gcc_solink_wrapper.py", root_build_dir) 8889 + rebase_path("//chromium/build/toolchain/gcc_solink_wrapper.py", root_build_dir) 8890 solink_extra_flags = "" 8891 if (current_os == "aix") { 8892 # to be intercepted by solink_wrapper, so that we exit immediately 8893 @@ -527,7 +527,7 @@ template("single_gcc_toolchain") { 8894 sofile = "{{output_dir}}/$soname" 8895 rspfile = sofile + ".rsp" 8896 8897 - pool = "//build/toolchain:link_pool($default_toolchain)" 8898 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8899 8900 if (defined(invoker.strip)) { 8901 unstripped_sofile = "{{root_out_dir}}/lib.unstripped/$soname" 8902 @@ -584,7 +584,7 @@ template("single_gcc_toolchain") { 8903 rspfile = "$outfile.rsp" 8904 unstripped_outfile = outfile 8905 8906 - pool = "//build/toolchain:link_pool($default_toolchain)" 8907 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8908 8909 # Use this for {{output_extension}} expansions unless a target manually 8910 # overrides it (in which case {{output_extension}} will be what the target 8911 @@ -626,7 +626,7 @@ template("single_gcc_toolchain") { 8912 } 8913 8914 link_wrapper = 8915 - rebase_path("//build/toolchain/gcc_link_wrapper.py", root_build_dir) 8916 + rebase_path("//chromium/build/toolchain/gcc_link_wrapper.py", root_build_dir) 8917 command = "\"$python_path\" \"$link_wrapper\" --output=\"$outfile\"$strip_switch$map_switch$dwp_switch -- $link_command" 8918 8919 description = "LINK $outfile" 8920 @@ -672,7 +672,7 @@ template("single_gcc_toolchain") { 8921 } 8922 8923 tool("action") { 8924 - pool = "//build/toolchain:action_pool($default_toolchain)" 8925 + pool = "//chromium/build/toolchain:action_pool($default_toolchain)" 8926 } 8927 8928 if (toolchain_has_rust) { 8929 @@ -683,7 +683,7 @@ template("single_gcc_toolchain") { 8930 rustc_bin = "$rust_sysroot_relative/bin/rustc" 8931 rustc = "$rust_compiler_prefix${rustc_bin}" 8932 rustc_wrapper = 8933 - rebase_path("//build/rust/rustc_wrapper.py", root_build_dir) 8934 + rebase_path("//chromium/build/rust/rustc_wrapper.py", root_build_dir) 8935 8936 # RSP manipulation due to https://bugs.chromium.org/p/gn/issues/detail?id=249 8937 tool("rust_staticlib") { 8938 @@ -735,7 +735,7 @@ template("single_gcc_toolchain") { 8939 exename = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8940 depfile = "$exename.d" 8941 rspfile = "$exename.rsp" 8942 - pool = "//build/toolchain:link_pool($default_toolchain)" 8943 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8944 8945 default_output_extension = default_executable_extension 8946 default_output_dir = "{{root_out_dir}}" 8947 @@ -751,7 +751,7 @@ template("single_gcc_toolchain") { 8948 dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8949 depfile = "$dllname.d" 8950 rspfile = "$dllname.rsp" 8951 - pool = "//build/toolchain:link_pool($default_toolchain)" 8952 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8953 8954 default_output_extension = default_shlib_extension 8955 output_prefix = "lib" 8956 @@ -768,7 +768,7 @@ template("single_gcc_toolchain") { 8957 dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 8958 depfile = "$dllname.d" 8959 rspfile = "$dllname.rsp" 8960 - pool = "//build/toolchain:link_pool($default_toolchain)" 8961 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 8962 8963 default_output_extension = default_shlib_extension 8964 output_prefix = "lib" 8965 diff --git a/toolchain/ios/BUILD.gn b/toolchain/ios/BUILD.gn 8966 index 121ac470b..eaed740ab 100644 8967 --- a/toolchain/ios/BUILD.gn 8968 +++ b/toolchain/ios/BUILD.gn 8969 @@ -2,8 +2,8 @@ 8970 # Use of this source code is governed by a BSD-style license that can be 8971 # found in the LICENSE file. 8972 8973 -import("//build/config/ios/ios_sdk.gni") 8974 -import("//build/toolchain/apple/toolchain.gni") 8975 +import("//chromium/build/config/ios/ios_sdk.gni") 8976 +import("//chromium/build/toolchain/apple/toolchain.gni") 8977 8978 # Specialisation of the apple_toolchain template to declare the toolchain 8979 # and its tools to build target for iOS platform. 8980 diff --git a/toolchain/linux/BUILD.gn b/toolchain/linux/BUILD.gn 8981 index b9fdcdde5..ead0a34b8 100644 8982 --- a/toolchain/linux/BUILD.gn 8983 +++ b/toolchain/linux/BUILD.gn 8984 @@ -2,11 +2,11 @@ 8985 # Use of this source code is governed by a BSD-style license that can be 8986 # found in the LICENSE file. 8987 8988 -import("//build/config/dcheck_always_on.gni") 8989 -import("//build/config/ozone.gni") 8990 -import("//build/config/sysroot.gni") 8991 -import("//build/config/ui.gni") 8992 -import("//build/toolchain/gcc_toolchain.gni") 8993 +import("//chromium/build/config/dcheck_always_on.gni") 8994 +import("//chromium/build/config/ozone.gni") 8995 +import("//chromium/build/config/sysroot.gni") 8996 +import("//chromium/build/config/ui.gni") 8997 +import("//chromium/build/toolchain/gcc_toolchain.gni") 8998 8999 clang_toolchain("clang_ppc64") { 9000 enable_linker_map = true 9001 diff --git a/toolchain/linux/unbundle/BUILD.gn b/toolchain/linux/unbundle/BUILD.gn 9002 index a09149123..68502471e 100644 9003 --- a/toolchain/linux/unbundle/BUILD.gn 9004 +++ b/toolchain/linux/unbundle/BUILD.gn 9005 @@ -2,7 +2,7 @@ 9006 # Use of this source code is governed by a BSD-style license that can be 9007 # found in the LICENSE file. 9008 9009 -import("//build/toolchain/gcc_toolchain.gni") 9010 +import("//chromium/build/toolchain/gcc_toolchain.gni") 9011 9012 gcc_toolchain("default") { 9013 cc = getenv("CC") 9014 diff --git a/toolchain/mac/BUILD.gn b/toolchain/mac/BUILD.gn 9015 index d8543c4f2..4b99db308 100644 9016 --- a/toolchain/mac/BUILD.gn 9017 +++ b/toolchain/mac/BUILD.gn 9018 @@ -2,9 +2,9 @@ 9019 # Use of this source code is governed by a BSD-style license that can be 9020 # found in the LICENSE file. 9021 9022 -import("//build/config/mac/mac_sdk.gni") 9023 -import("//build/config/v8_target_cpu.gni") 9024 -import("//build/toolchain/apple/toolchain.gni") 9025 +import("//chromium/build/config/mac/mac_sdk.gni") 9026 +import("//chromium/build/config/v8_target_cpu.gni") 9027 +import("//chromium/build/toolchain/apple/toolchain.gni") 9028 import("//build_overrides/build.gni") 9029 9030 # Specialisation of the apple_toolchain template to declare the toolchain 9031 diff --git a/toolchain/nacl/BUILD.gn b/toolchain/nacl/BUILD.gn 9032 index 910217c42..8d70258fc 100644 9033 --- a/toolchain/nacl/BUILD.gn 9034 +++ b/toolchain/nacl/BUILD.gn 9035 @@ -2,9 +2,9 @@ 9036 # Use of this source code is governed by a BSD-style license that can be 9037 # found in the LICENSE file. 9038 9039 -import("//build/config/nacl/config.gni") 9040 -import("//build/config/sysroot.gni") 9041 -import("//build/toolchain/nacl_toolchain.gni") 9042 +import("//chromium/build/config/nacl/config.gni") 9043 +import("//chromium/build/config/sysroot.gni") 9044 +import("//chromium/build/toolchain/nacl_toolchain.gni") 9045 9046 # Add the toolchain revision as a preprocessor define so that sources are 9047 # rebuilt when a toolchain is updated. 9048 diff --git a/toolchain/nacl_toolchain.gni b/toolchain/nacl_toolchain.gni 9049 index fbaa65e48..6ca7ce48a 100644 9050 --- a/toolchain/nacl_toolchain.gni 9051 +++ b/toolchain/nacl_toolchain.gni 9052 @@ -2,8 +2,8 @@ 9053 # Use of this source code is governed by a BSD-style license that can be 9054 # found in the LICENSE file. 9055 9056 -import("//build/config/nacl/config.gni") 9057 -import("//build/toolchain/gcc_toolchain.gni") 9058 +import("//chromium/build/config/nacl/config.gni") 9059 +import("//chromium/build/toolchain/gcc_toolchain.gni") 9060 9061 # This template defines a NaCl toolchain. 9062 # 9063 diff --git a/toolchain/rbe.gni b/toolchain/rbe.gni 9064 index 444ac6573..c5ca47ba7 100644 9065 --- a/toolchain/rbe.gni 9066 +++ b/toolchain/rbe.gni 9067 @@ -4,8 +4,8 @@ 9068 9069 # Defines the configuration of Remote Build Execution (RBE). 9070 9071 -import("//build/toolchain/remoteexec_defaults.gni") 9072 -import("//build/toolchain/siso.gni") 9073 +import("//chromium/build/toolchain/remoteexec_defaults.gni") 9074 +import("//chromium/build/toolchain/siso.gni") 9075 9076 declare_args() { 9077 # Deprecated: Please use reclient_bin_dir instead. 9078 @@ -135,7 +135,7 @@ if (use_reclient_cfgs && current_toolchain == default_toolchain) { 9079 # it doesn't. 9080 if (!path_exists(reclient_cc_cfg_file)) { 9081 # Use exec_script() to show a good error message. 9082 - exec_script(rebase_path("//build/toolchain/check_rewrapper_cfg.py"), 9083 + exec_script(rebase_path("//chromium/build/toolchain/check_rewrapper_cfg.py"), 9084 [ reclient_cc_cfg_file ], 9085 "", 9086 [ rebase_path(reclient_cc_cfg_file, ".", root_build_dir) ]) 9087 diff --git a/toolchain/siso.gni b/toolchain/siso.gni 9088 index 94650c710..7725d666e 100644 9089 --- a/toolchain/siso.gni 9090 +++ b/toolchain/siso.gni 9091 @@ -1,6 +1,6 @@ 9092 # Defines the configuration of siso (next-gen build system) 9093 9094 -import("//build/config/gclient_args.gni") 9095 +import("//chromium/build/config/gclient_args.gni") 9096 9097 # use_siso_default is default value of use_siso. 9098 # need to match with autoninja's logic. 9099 @@ -16,7 +16,7 @@ if (path_exists("/usr/bin/gcert") || # linux 9100 9101 _is_ninja_used = path_exists(rebase_path(".ninja_deps", root_build_dir)) 9102 9103 -if (path_exists("//build/config/siso/.sisoenv") && 9104 +if (path_exists("//chromium/build/config/siso/.sisoenv") && 9105 defined(build_with_chromium) && build_with_chromium && 9106 _is_google_corp_machine && !_is_ninja_used) { 9107 use_siso_default = true 9108 diff --git a/toolchain/toolchain.gni b/toolchain/toolchain.gni 9109 index ce642da05..754f0e3bb 100644 9110 --- a/toolchain/toolchain.gni 9111 +++ b/toolchain/toolchain.gni 9112 @@ -5,8 +5,8 @@ 9113 # Toolchain-related configuration that may be needed outside the context of the 9114 # toolchain() rules themselves. 9115 9116 -import("//build/config/cast.gni") 9117 -import("//build/config/chrome_build.gni") 9118 +import("//chromium/build/config/cast.gni") 9119 +import("//chromium/build/config/chrome_build.gni") 9120 import("//build_overrides/build.gni") 9121 9122 declare_args() { 9123 @@ -105,7 +105,7 @@ stamp_description = "STAMP {{output}}" 9124 copy_description = "COPY {{source}} {{output}}" 9125 if (host_os == "win") { 9126 _tool_wrapper_path = 9127 - rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) 9128 + rebase_path("//chromium/build/toolchain/win/tool_wrapper.py", root_build_dir) 9129 9130 stamp_command = "cmd /c type nul > \"{{output}}\"" 9131 copy_command = "\"$python_path\" $_tool_wrapper_path recursive-mirror {{source}} {{output}}" 9132 diff --git a/toolchain/wasm/BUILD.gn b/toolchain/wasm/BUILD.gn 9133 index 38298f349..26d790b0b 100644 9134 --- a/toolchain/wasm/BUILD.gn 9135 +++ b/toolchain/wasm/BUILD.gn 9136 @@ -2,7 +2,7 @@ 9137 # Use of this source code is governed by a BSD-style license that can be 9138 # found in the LICENSE file. 9139 9140 -import("//build/toolchain/gcc_toolchain.gni") 9141 +import("//chromium/build/toolchain/gcc_toolchain.gni") 9142 9143 # This WASM toolchain is NOT to be used to build any Chromium code, 9144 # i.e. tests and samples are currently fine. 9145 diff --git a/toolchain/win/BUILD.gn b/toolchain/win/BUILD.gn 9146 index d7f348487..1727eb6f6 100644 9147 --- a/toolchain/win/BUILD.gn 9148 +++ b/toolchain/win/BUILD.gn 9149 @@ -2,8 +2,8 @@ 9150 # Use of this source code is governed by a BSD-style license that can be 9151 # found in the LICENSE file. 9152 9153 -import("//build/config/win/visual_studio_version.gni") 9154 -import("//build/toolchain/win/toolchain.gni") 9155 +import("//chromium/build/config/win/visual_studio_version.gni") 9156 +import("//chromium/build/toolchain/win/toolchain.gni") 9157 9158 assert(is_win, "Should only be running on Windows") 9159 9160 @@ -71,7 +71,7 @@ if (target_os == "winuwp") { 9161 # as the UWP toolchain requires the `environment.store_$CPU` variable, instead 9162 # of the usual `environment.$CPU`. 9163 store_cpu_toolchain_data = 9164 - exec_script("//build/toolchain/win/setup_toolchain.py", 9165 + exec_script("//chromium/build/toolchain/win/setup_toolchain.py", 9166 [ 9167 visual_studio_path, 9168 windows_sdk_path, 9169 diff --git a/toolchain/win/midl.gni b/toolchain/win/midl.gni 9170 index c906b6394..fcab19141 100644 9171 --- a/toolchain/win/midl.gni 9172 +++ b/toolchain/win/midl.gni 9173 @@ -4,7 +4,7 @@ 9174 9175 assert(is_win) 9176 9177 -import("//build/config/win/visual_studio_version.gni") 9178 +import("//chromium/build/config/win/visual_studio_version.gni") 9179 9180 # This template defines a rule to invoke the MS IDL compiler. The generated 9181 # source code will be compiled and linked into targets that depend on this. 9182 @@ -126,7 +126,7 @@ template("midl") { 9183 9184 action_foreach(action_name) { 9185 visibility = [ ":$source_set_name" ] 9186 - script = "//build/toolchain/win/midl.py" 9187 + script = "//chromium/build/toolchain/win/midl.py" 9188 9189 sources = invoker.sources 9190 9191 diff --git a/toolchain/win/toolchain.gni b/toolchain/win/toolchain.gni 9192 index 7dbd8a17e..96b978aad 100644 9193 --- a/toolchain/win/toolchain.gni 9194 +++ b/toolchain/win/toolchain.gni 9195 @@ -2,21 +2,21 @@ 9196 # Use of this source code is governed by a BSD-style license that can be 9197 # found in the LICENSE file. 9198 9199 -import("//build/config/clang/clang.gni") 9200 -import("//build/config/compiler/compiler.gni") 9201 -import("//build/config/rust.gni") 9202 -import("//build/config/sanitizers/sanitizers.gni") 9203 -import("//build/config/win/visual_studio_version.gni") 9204 -import("//build/toolchain/cc_wrapper.gni") 9205 -import("//build/toolchain/rbe.gni") 9206 -import("//build/toolchain/toolchain.gni") 9207 -import("//build/toolchain/win/win_toolchain_data.gni") 9208 +import("//chromium/build/config/clang/clang.gni") 9209 +import("//chromium/build/config/compiler/compiler.gni") 9210 +import("//chromium/build/config/rust.gni") 9211 +import("//chromium/build/config/sanitizers/sanitizers.gni") 9212 +import("//chromium/build/config/win/visual_studio_version.gni") 9213 +import("//chromium/build/toolchain/cc_wrapper.gni") 9214 +import("//chromium/build/toolchain/rbe.gni") 9215 +import("//chromium/build/toolchain/toolchain.gni") 9216 +import("//chromium/build/toolchain/win/win_toolchain_data.gni") 9217 9218 assert(is_win, "Should only be running on Windows") 9219 9220 # This tool will is used as a wrapper for various commands below. 9221 _tool_wrapper_path = 9222 - rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) 9223 + rebase_path("//chromium/build/toolchain/win/tool_wrapper.py", root_build_dir) 9224 9225 if (host_os == "win") { 9226 _exe = ".exe" 9227 @@ -188,7 +188,7 @@ template("msvc_toolchain") { 9228 } 9229 9230 coverage_wrapper = 9231 - rebase_path("//build/toolchain/clang_code_coverage_wrapper.py", 9232 + rebase_path("//chromium/build/toolchain/clang_code_coverage_wrapper.py", 9233 root_build_dir) 9234 coverage_wrapper = coverage_wrapper + " --target-os=" + target_os 9235 if (toolchain_coverage_instrumentation_input_file != "") { 9236 @@ -306,7 +306,7 @@ template("msvc_toolchain") { 9237 # Wrap ml(64).exe with a script that makes its output deterministic. 9238 # It's lld only because the script zaps obj Timestamp which 9239 # link.exe /incremental looks at. 9240 - ml_py = rebase_path("//build/toolchain/win/ml.py", root_build_dir) 9241 + ml_py = rebase_path("//chromium/build/toolchain/win/ml.py", root_build_dir) 9242 ml = "\"$python_path\" $ml_py $ml" 9243 } 9244 9245 @@ -330,7 +330,7 @@ template("msvc_toolchain") { 9246 rust_sysroot_relative = rebase_path(rust_sysroot, root_build_dir) 9247 rustc = "$rust_sysroot_relative/bin/rustc" 9248 rustc_wrapper = 9249 - rebase_path("//build/rust/rustc_wrapper.py", root_build_dir) 9250 + rebase_path("//chromium/build/rust/rustc_wrapper.py", root_build_dir) 9251 rustc_windows_args = " -Clinker=$link$rust_linkflags $rustc_common_args" 9252 9253 tool("rust_staticlib") { 9254 @@ -384,7 +384,7 @@ template("msvc_toolchain") { 9255 pdbname = "$exename.pdb" 9256 rspfile = "$exename.rsp" 9257 depfile = "$exename.d" 9258 - pool = "//build/toolchain:link_pool($default_toolchain)" 9259 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 9260 9261 default_output_extension = ".exe" 9262 default_output_dir = "{{root_out_dir}}" 9263 @@ -409,7 +409,7 @@ template("msvc_toolchain") { 9264 pdbname = "$dllname.pdb" 9265 rspfile = "$dllname.rsp" 9266 depfile = "$dllname.d" 9267 - pool = "//build/toolchain:link_pool($default_toolchain)" 9268 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 9269 9270 default_output_extension = ".dll" 9271 default_output_dir = "{{root_out_dir}}" 9272 @@ -445,7 +445,7 @@ template("msvc_toolchain") { 9273 pdbname = "$dllname.pdb" 9274 rspfile = "$dllname.rsp" 9275 depfile = "$dllname.d" 9276 - pool = "//build/toolchain:link_pool($default_toolchain)" 9277 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 9278 9279 default_output_extension = ".dll" 9280 default_output_dir = "{{root_out_dir}}" 9281 @@ -498,7 +498,7 @@ template("msvc_toolchain") { 9282 libname = "${dllname}.lib" # e.g. foo.dll.lib 9283 pdbname = "${dllname}.pdb" 9284 rspfile = "${dllname}.rsp" 9285 - pool = "//build/toolchain:link_pool($default_toolchain)" 9286 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 9287 9288 command = "$linker_wrapper$link$cc_linkflags \"/OUT:$dllname\" /nologo ${sys_lib_flags} \"/IMPLIB:$libname\" /DLL \"/PDB:$pdbname\" \"@$rspfile\"" 9289 9290 @@ -533,7 +533,7 @@ template("msvc_toolchain") { 9291 dllname = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 9292 pdbname = "${dllname}.pdb" 9293 rspfile = "${dllname}.rsp" 9294 - pool = "//build/toolchain:link_pool($default_toolchain)" 9295 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 9296 9297 command = "$linker_wrapper$link$cc_linkflags \"/OUT:$dllname\" /nologo ${sys_lib_flags} /DLL \"/PDB:$pdbname\" \"@$rspfile\"" 9298 9299 @@ -556,7 +556,7 @@ template("msvc_toolchain") { 9300 exename = "{{output_dir}}/{{target_output_name}}{{output_extension}}" 9301 pdbname = "$exename.pdb" 9302 rspfile = "$exename.rsp" 9303 - pool = "//build/toolchain:link_pool($default_toolchain)" 9304 + pool = "//chromium/build/toolchain:link_pool($default_toolchain)" 9305 9306 command = "$linker_wrapper$link$cc_linkflags \"/OUT:$exename\" /nologo ${sys_lib_flags} \"/PDB:$pdbname\" \"@$rspfile\"" 9307 9308 @@ -581,16 +581,16 @@ template("msvc_toolchain") { 9309 tool("stamp") { 9310 command = stamp_command 9311 description = stamp_description 9312 - pool = "//build/toolchain:action_pool($default_toolchain)" 9313 + pool = "//chromium/build/toolchain:action_pool($default_toolchain)" 9314 } 9315 tool("copy") { 9316 command = copy_command 9317 description = copy_description 9318 - pool = "//build/toolchain:action_pool($default_toolchain)" 9319 + pool = "//chromium/build/toolchain:action_pool($default_toolchain)" 9320 } 9321 9322 tool("action") { 9323 - pool = "//build/toolchain:action_pool($default_toolchain)" 9324 + pool = "//chromium/build/toolchain:action_pool($default_toolchain)" 9325 } 9326 } 9327 } 9328 diff --git a/toolchain/win/win_toolchain_data.gni b/toolchain/win/win_toolchain_data.gni 9329 index a6e8328b2..495f5502d 100644 9330 --- a/toolchain/win/win_toolchain_data.gni 9331 +++ b/toolchain/win/win_toolchain_data.gni 9332 @@ -2,11 +2,11 @@ 9333 # Use of this source code is governed by a BSD-style license that can be 9334 # found in the LICENSE file. 9335 9336 -import("//build/config/win/visual_studio_version.gni") 9337 +import("//chromium/build/config/win/visual_studio_version.gni") 9338 9339 declare_args() { 9340 win_toolchain_data_x86 = 9341 - exec_script("//build/toolchain/win/setup_toolchain.py", 9342 + exec_script("//chromium/build/toolchain/win/setup_toolchain.py", 9343 [ 9344 visual_studio_path, 9345 windows_sdk_path, 9346 @@ -18,7 +18,7 @@ declare_args() { 9347 "scope") 9348 9349 win_toolchain_data_x64 = 9350 - exec_script("//build/toolchain/win/setup_toolchain.py", 9351 + exec_script("//chromium/build/toolchain/win/setup_toolchain.py", 9352 [ 9353 visual_studio_path, 9354 windows_sdk_path, 9355 @@ -30,7 +30,7 @@ declare_args() { 9356 "scope") 9357 if (target_cpu == "arm64" || host_cpu == "arm64") { 9358 win_toolchain_data_arm64 = 9359 - exec_script("//build/toolchain/win/setup_toolchain.py", 9360 + exec_script("//chromium/build/toolchain/win/setup_toolchain.py", 9361 [ 9362 visual_studio_path, 9363 windows_sdk_path, 9364 diff --git a/toolchain/zos/BUILD.gn b/toolchain/zos/BUILD.gn 9365 index 94f8caf1a..01689744c 100644 9366 --- a/toolchain/zos/BUILD.gn 9367 +++ b/toolchain/zos/BUILD.gn 9368 @@ -4,7 +4,7 @@ 9369 9370 # This file is based on gcc_toolchain.gni and customized for z/OS. 9371 9372 -import("//build/toolchain/gcc_toolchain.gni") 9373 +import("//chromium/build/toolchain/gcc_toolchain.gni") 9374 9375 toolchain("s390x") { 9376 cc = "ibm-clang" 9377 @@ -91,7 +91,7 @@ toolchain("s390x") { 9378 link_command = "$ld -Wl,-x${xfile} {{ldflags}}${extra_ldflags} -o \"$sofile\" `cat $rspfile`" 9379 9380 solink_wrapper = 9381 - rebase_path("//build/toolchain/gcc_link_wrapper.py", root_build_dir) 9382 + rebase_path("//chromium/build/toolchain/gcc_link_wrapper.py", root_build_dir) 9383 command = 9384 "$python_path \"$solink_wrapper\" --output=\"$sofile\" -- $link_command" 9385 9386 @@ -152,7 +152,7 @@ toolchain("s390x") { 9387 link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$outfile\" `cat $rspfile` {{solibs}} {{libs}}" 9388 9389 link_wrapper = 9390 - rebase_path("//build/toolchain/gcc_link_wrapper.py", root_build_dir) 9391 + rebase_path("//chromium/build/toolchain/gcc_link_wrapper.py", root_build_dir) 9392 9393 command = 9394 "$python_path \"$link_wrapper\" --output=\"$outfile\" -- $link_command" 9395 diff --git a/util/BUILD.gn b/util/BUILD.gn 9396 index b5fd3bbf3..9b2301c7f 100644 9397 --- a/util/BUILD.gn 9398 +++ b/util/BUILD.gn 9399 @@ -2,7 +2,7 @@ 9400 # Use of this source code is governed by a BSD-style license that can be 9401 # found in the LICENSE file. 9402 9403 -import("//build/util/lastchange.gni") 9404 +import("//chromium/build/util/lastchange.gni") 9405 9406 action("chromium_git_revision") { 9407 script = "version.py" 9408 @@ -33,15 +33,15 @@ action("chromium_git_revision") { 9409 group("test_results") { 9410 data = [ 9411 "//.vpython3", 9412 - "//build/util/lib/__init__.py", 9413 - "//build/util/lib/results/", 9414 + "//chromium/build/util/lib/__init__.py", 9415 + "//chromium/build/util/lib/results/", 9416 ] 9417 } 9418 9419 group("proto") { 9420 data = [ 9421 "//.vpython3", 9422 - "//build/util/lib/__init__.py", 9423 - "//build/util/lib/proto/", 9424 + "//chromium/build/util/lib/__init__.py", 9425 + "//chromium/build/util/lib/proto/", 9426 ] 9427 } 9428 diff --git a/util/branding.gni b/util/branding.gni 9429 index 1d4ffd68a..bb99883da 100644 9430 --- a/util/branding.gni 9431 +++ b/util/branding.gni 9432 @@ -12,7 +12,7 @@ 9433 # These values should only be used if you REALLY need to depend on them at 9434 # build-time, for example, in the computation of output file names. 9435 9436 -import("//build/config/chrome_build.gni") 9437 +import("//chromium/build/config/chrome_build.gni") 9438 9439 _branding_dictionary_template = 9440 "full_name = \"@PRODUCT_FULLNAME@\" " + 9441 diff --git a/util/generate_wrapper.gni b/util/generate_wrapper.gni 9442 index e2ceccc9e..ef90a26ed 100644 9443 --- a/util/generate_wrapper.gni 9444 +++ b/util/generate_wrapper.gni 9445 @@ -45,7 +45,7 @@ template("generate_wrapper") { 9446 if (defined(invoker.generator_script)) { 9447 script = invoker.generator_script 9448 } else { 9449 - script = "//build/util/generate_wrapper.py" 9450 + script = "//chromium/build/util/generate_wrapper.py" 9451 } 9452 _wrapper_script = invoker.wrapper_script 9453 if (is_win) { 9454 diff --git a/util/java_action.gni b/util/java_action.gni 9455 index 81f6da5e1..9ac8d634a 100644 9456 --- a/util/java_action.gni 9457 +++ b/util/java_action.gni 9458 @@ -2,7 +2,7 @@ 9459 # Use of this source code is governed by a BSD-style license that can be 9460 # found in the LICENSE file. 9461 9462 -jarrunner = "//build/util/java_action.py" 9463 +jarrunner = "//chromium/build/util/java_action.py" 9464 9465 # Declare a target that runs a java command a single time. 9466 # 9467 diff --git a/util/lastchange.gni b/util/lastchange.gni 9468 index 8ed577a20..93801984a 100644 9469 --- a/util/lastchange.gni 9470 +++ b/util/lastchange.gni 9471 @@ -10,7 +10,7 @@ declare_args() { 9472 } 9473 9474 if (use_dummy_lastchange) { 9475 - lastchange_file = "//build/util/LASTCHANGE.dummy" 9476 + lastchange_file = "//chromium/build/util/LASTCHANGE.dummy" 9477 } else { 9478 - lastchange_file = "//build/util/LASTCHANGE" 9479 + lastchange_file = "//chromium/build/util/LASTCHANGE" 9480 } 9481 diff --git a/util/process_version.gni b/util/process_version.gni 9482 index 3489bbaf4..06c53c1b6 100644 9483 --- a/util/process_version.gni 9484 +++ b/util/process_version.gni 9485 @@ -2,7 +2,7 @@ 9486 # Use of this source code is governed by a BSD-style license that can be 9487 # found in the LICENSE file. 9488 9489 -import("//build/util/lastchange.gni") 9490 +import("//chromium/build/util/lastchange.gni") 9491 9492 # Runs the version processing script over the given template file to produce 9493 # an output file. This is used for generating various forms of files that 9494 @@ -67,9 +67,9 @@ template("process_version") { 9495 } 9496 9497 action(action_name) { 9498 - script = "//build/util/version.py" 9499 + script = "//chromium/build/util/version.py" 9500 9501 - sources = [ "//build/util/android_chrome_version.py" ] 9502 + sources = [ "//chromium/build/util/android_chrome_version.py" ] 9503 9504 inputs = [ lastchange_file ] 9505 if (defined(invoker.inputs)) { 9506 diff --git a/win/BUILD.gn b/win/BUILD.gn 9507 index a63996d6d..23be394aa 100644 9508 --- a/win/BUILD.gn 9509 +++ b/win/BUILD.gn 9510 @@ -2,9 +2,9 @@ 9511 # Use of this source code is governed by a BSD-style license that can be 9512 # found in the LICENSE file. 9513 9514 -import("//build/config/clang/clang.gni") 9515 -import("//build/config/sanitizers/sanitizers.gni") 9516 -import("//build/config/win/manifest.gni") 9517 +import("//chromium/build/config/clang/clang.gni") 9518 +import("//chromium/build/config/sanitizers/sanitizers.gni") 9519 +import("//chromium/build/config/win/manifest.gni") 9520 9521 # Depending on this target will cause the manifests for Chrome's default 9522 # Windows and common control compatibility and elevation for executables. 9523 @@ -21,10 +21,10 @@ if (is_win) { 9524 # "Windows cross-builds from Mac must be 64-bit.") 9525 9526 action("copy_cdb_to_output") { 9527 - script = "//build/win/copy_cdb_to_output.py" 9528 + script = "//chromium/build/win/copy_cdb_to_output.py" 9529 inputs = [ 9530 script, 9531 - "//build/vs_toolchain.py", 9532 + "//chromium/build/vs_toolchain.py", 9533 ] 9534 outputs = [ 9535 "$root_out_dir/cdb/cdb.exe", 9536 diff --git a/win/message_compiler.gni b/win/message_compiler.gni 9537 index c0b42b2dd..ffbfbf396 100644 9538 --- a/win/message_compiler.gni 9539 +++ b/win/message_compiler.gni 9540 @@ -40,7 +40,7 @@ template("message_compiler") { 9541 forward_variables_from(invoker, [ "visibility" ]) 9542 } 9543 9544 - script = "//build/win/message_compiler.py" 9545 + script = "//chromium/build/win/message_compiler.py" 9546 9547 outputs = [ 9548 "$target_gen_dir/{{source_name_part}}.h",