|
|
|
|
Quelle 0025.patch
Sprache: unbekannt
|
|
From: Michael Froman <mfroman@mozilla.com>
Date: Thu, 10 Oct 2024 13:42:00 +0000
Subject: Bug 1921707 - point to new build directory location in
third_party/chromium/build r=ng,glandium
Ran:
ack -l "\"//build/" third_party/chromium/build | xargs sed -i.bak -E 's/\"\/\/build\//\"\ /\/chromium\/build\//'
ack -l "\"//build:" third_party/chromium/build | xargs sed -i.bak -E 's/\"\/\/build:/\"\/\/chromium\/build:/'
find third_party -name "*.bak" | xargs rm
hg revert \
third_party/chromium/build/android/pylib/utils/gold_utils.py \
third_party/chromium/build/args/README.txt \
third_party/chromium/build/args/chromeos/README.md \
third_party/chromium/build/gn_helpers_unittest.py \
third_party/chromium/build/locale_tool.py \
third_party/chromium/build/toolchain/linux/unbundle/README.md
Differential Revision: https://phabricator.services.mozilla.com/D224542
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/6b855a2bf6b1f3feb9c6558a9357fed8e43c5b99
---
BUILD.gn | 10 +-
android/BUILD.gn | 14 +-
android/bytecode/BUILD.gn | 2 +-
android/gtest_apk/BUILD.gn | 2 +-
android/gyp/test/BUILD.gn | 2 +-
android/incremental_install/BUILD.gn | 2 +-
android/native_flags/BUILD.gn | 4 +-
android/pylib/device/commands/BUILD.gn | 2 +-
android/resource_sizes.gni | 6 +-
android/stacktrace/BUILD.gn | 2 +-
android/test/BUILD.gn | 4 +-
android/test/incremental_javac_gn/BUILD.gn | 4 +-
android/test/missing_symbol_test.gni | 6 +-
android/test/nocompile_gn/BUILD.gn | 8 +-
android/unused_resources/BUILD.gn | 4 +-
apple/apple_info_plist.gni | 2 +-
apple/compile_entitlements.gni | 2 +-
apple/compile_plist.gni | 4 +-
apple/convert_plist.gni | 2 +-
apple/tweak_info_plist.gni | 8 +-
args/headless.gn | 2 +-
buildflag_header.gni | 4 +-
cipd/cipd.gni | 4 +-
compiled_action.gni | 4 +-
config/BUILD.gn | 62 ++++----
config/BUILDCONFIG.gn | 140 +++++++++---------
config/aix/BUILD.gn | 4 +-
config/android/BUILD.gn | 14 +-
config/android/abi.gni | 4 +-
config/android/android_nocompile.gni | 6 +-
config/android/build_vars.gni | 2 +-
config/android/config.gni | 12 +-
config/android/copy_ex.gni | 4 +-
config/android/extract_unwind_tables.gni | 4 +-
config/android/internal_rules.gni | 108 +++++++-------
config/android/linker_version_script.gni | 4 +-
config/android/rules.gni | 112 +++++++-------
config/android/test/classpath_order/BUILD.gn | 2 +-
config/android/test/proto/BUILD.gn | 2 +-
config/android/test/resource_overlay/BUILD.gn | 2 +-
config/apple/symbols.gni | 4 +-
config/arm.gni | 2 +-
config/buildflags_paint_preview.gni | 4 +-
config/c++/BUILD.gn | 8 +-
config/c++/c++.gni | 6 +-
config/chromecast/BUILD.gn | 2 +-
config/chromeos/BUILD.gn | 2 +-
config/chromeos/rules.gni | 36 ++---
config/clang/clang.gni | 4 +-
config/compiler/BUILD.gn | 112 +++++++-------
config/compiler/compiler.gni | 26 ++--
config/compiler/pgo/BUILD.gn | 10 +-
config/compiler/pgo/pgo.gni | 4 +-
config/coverage/BUILD.gn | 2 +-
config/coverage/coverage.gni | 2 +-
config/dcheck_always_on.gni | 2 +-
config/devtools.gni | 2 +-
config/features.gni | 4 +-
config/freetype/BUILD.gn | 6 +-
config/fuchsia/BUILD.gn | 2 +-
config/fuchsia/generate_runner_scripts.gni | 22 +--
config/fuchsia/package.gni | 2 +-
config/fuchsia/rules.gni | 2 +-
config/fuchsia/sizes.gni | 6 +-
config/fuchsia/symbol_archive.gni | 2 +-
config/gcc/BUILD.gn | 12 +-
config/host_byteorder.gni | 2 +-
config/ios/BUILD.gn | 10 +-
config/ios/asset_catalog.gni | 4 +-
config/ios/ios_sdk.gni | 12 +-
config/ios/ios_test_runner_wrapper.gni | 6 +-
config/ios/rules.gni | 66 ++++-----
config/linux/BUILD.gn | 12 +-
config/linux/atk/BUILD.gn | 8 +-
config/linux/atspi2/BUILD.gn | 4 +-
config/linux/dbus/BUILD.gn | 4 +-
config/linux/dri/BUILD.gn | 2 +-
config/linux/gtk/BUILD.gn | 4 +-
config/linux/gtk/gtk.gni | 2 +-
config/linux/libdrm/BUILD.gn | 6 +-
config/linux/libffi/BUILD.gn | 4 +-
config/linux/libva/BUILD.gn | 2 +-
config/linux/nss/BUILD.gn | 2 +-
config/linux/pangocairo/BUILD.gn | 4 +-
config/linux/pangocairo/pangocairo.gni | 4 +-
config/linux/pkg_config.gni | 4 +-
config/locales.gni | 2 +-
config/logging.gni | 4 +-
config/mac/BUILD.gn | 10 +-
config/mac/mac_sdk.gni | 16 +-
config/mac/rules.gni | 16 +-
config/mips.gni | 2 +-
config/nacl/BUILD.gn | 2 +-
config/nacl/config.gni | 4 +-
config/nacl/rules.gni | 4 +-
config/ozone.gni | 8 +-
config/pch.gni | 4 +-
config/posix/BUILD.gn | 6 +-
config/profiling/profiling.gni | 4 +-
config/python.gni | 4 +-
config/rust.gni | 10 +-
config/sanitizers/BUILD.gn | 26 ++--
config/sanitizers/sanitizers.gni | 20 +--
config/sysroot.gni | 12 +-
config/ui.gni | 8 +-
config/v8_target_cpu.gni | 10 +-
config/win/BUILD.gn | 22 +--
config/win/console_app.gni | 2 +-
config/win/control_flow_guard.gni | 2 +-
config/win/manifest.gni | 10 +-
config/zip.gni | 2 +-
dotfile_settings.gni | 62 ++++----
gn_logs.gni | 2 +-
ios/intent_definition.gni | 8 +-
lacros/BUILD.gn | 4 +-
lacros/lacros_resource_sizes.gni | 6 +-
linux/BUILD.gn | 6 +-
linux/extract_symbols.gni | 6 +-
linux/strip_binary.gni | 4 +-
linux/unbundle/ffmpeg.gn | 6 +-
linux/unbundle/flac.gn | 4 +-
linux/unbundle/icu.gn | 4 +-
linux/unbundle/libdrm.gn | 4 +-
linux/unbundle/libevent.gn | 2 +-
linux/unbundle/libpng.gn | 4 +-
linux/unbundle/libvpx.gn | 4 +-
linux/unbundle/libwebp.gn | 4 +-
linux/unbundle/libxml.gn | 2 +-
linux/unbundle/libxslt.gn | 2 +-
linux/unbundle/openh264.gn | 4 +-
linux/unbundle/opus.gn | 4 +-
linux/unbundle/re2.gn | 4 +-
linux/unbundle/snappy.gn | 2 +-
linux/unbundle/zlib.gn | 2 +-
nocompile.gni | 12 +-
partitioned_shared_library.gni | 8 +-
rust/std/BUILD.gn | 4 +-
rust/tests/BUILD.gn | 2 +-
.../test_cpp_exe_including_rust/BUILD.gn | 2 +-
rust/tests/test_rust_exe/BUILD.gn | 2 +-
rust/tests/test_rust_source_set/BUILD.gn | 6 +-
symlink.gni | 2 +-
timestamp.gni | 2 +-
toolchain/BUILD.gn | 6 +-
toolchain/aix/BUILD.gn | 2 +-
toolchain/android/BUILD.gn | 12 +-
toolchain/apple/BUILD.gn | 2 +-
toolchain/apple/toolchain.gni | 48 +++---
toolchain/cc_wrapper.gni | 4 +-
toolchain/concurrent_links.gni | 14 +-
toolchain/cros/BUILD.gn | 8 +-
toolchain/cros_toolchain.gni | 4 +-
toolchain/fuchsia/BUILD.gn | 2 +-
toolchain/gcc_toolchain.gni | 38 ++---
toolchain/ios/BUILD.gn | 12 +-
toolchain/linux/BUILD.gn | 6 +-
toolchain/linux/unbundle/BUILD.gn | 2 +-
toolchain/mac/BUILD.gn | 4 +-
toolchain/nacl/BUILD.gn | 6 +-
toolchain/nacl_toolchain.gni | 4 +-
toolchain/toolchain.gni | 6 +-
toolchain/win/BUILD.gn | 32 ++--
toolchain/win/midl.gni | 4 +-
util/BUILD.gn | 6 +-
util/branding.gni | 2 +-
util/generate_wrapper.gni | 2 +-
util/java_action.gni | 2 +-
util/lastchange.gni | 4 +-
util/process_version.gni | 4 +-
util/version.gni | 2 +-
win/BUILD.gn | 10 +-
win/message_compiler.gni | 2 +-
172 files changed, 842 insertions(+), 842 deletions(-)
diff --git a/BUILD.gn b/BUILD.gn
index b1724eb6a..7f459e30f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/buildflag_header.gni")
-import("//build/config/chrome_build.gni")
-import("//build/config/chromecast_build.gni")
-import("//build/config/chromeos/args.gni")
-import("//build/config/chromeos/ui_mode.gni")
+import("//chromium/build/buildflag_header.gni")
+import("//chromium/build/config/chrome_build.gni")
+import("//chromium/build/config/chromecast_build.gni")
+import("//chromium/build/config/chromeos/args.gni")
+import("//chromium/build/config/chromeos/ui_mode.gni")
source_set("buildflag_header_h") {
sources = [ "buildflag.h" ]
diff --git a/android/BUILD.gn b/android/BUILD.gn
index c24fce529..c64b7fc66 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/build_vars.gni")
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-import("//build/config/python.gni")
+import("//chromium/build/config/android/build_vars.gni")
+import("//chromium/build/config/android/config.gni")
+import("//chromium/build/config/android/rules.gni")
+import("//chromium/build/config/python.gni")
import("//build_overrides/build.gni")
if (enable_java_templates) {
@@ -55,7 +55,7 @@ python_library("devil_chromium_py") {
"//third_party/catapult/devil/devil/devil_dependencies.json",
# Read by gn_helpers.BuildWithChromium()
- "//build/config/gclient_args.gni",
+ "//chromium/build/config/gclient_args.gni",
]
}
@@ -65,7 +65,7 @@ group("apk_installer_data") {
# Other //build users let devil library fetch these from Google Storage.
if (build_with_chromium) {
data_deps = [
- "//build/android/pylib/device/commands",
+ "//chromium/build/android/pylib/device/commands",
"//tools/android/md5sum",
]
data = [
@@ -111,7 +111,7 @@ python_library("test_runner_py") {
# Proguard is needed only when using apks (rather than native executables).
if (enable_java_templates) {
- deps = [ "//build/android/stacktrace:java_deobfuscate" ]
+ deps = [ "//chromium/build/android/stacktrace:java_deobfuscate" ]
}
}
diff --git a/android/bytecode/BUILD.gn b/android/bytecode/BUILD.gn
index 8d717eb0a..aca9dcc8e 100644
--- a/android/bytecode/BUILD.gn
+++ b/android/bytecode/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
java_binary("bytecode_processor") {
main_class = "org.chromium.bytecode.ByteCodeProcessor"
diff --git a/android/gtest_apk/BUILD.gn b/android/gtest_apk/BUILD.gn
index 2a72bc47e..fde499535 100644
--- a/android/gtest_apk/BUILD.gn
+++ b/android/gtest_apk/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
android_library("native_test_instrumentation_test_runner_java") {
testonly = true
diff --git a/android/gyp/test/BUILD.gn b/android/gyp/test/BUILD.gn
index 301a220d0..421865b3e 100644
--- a/android/gyp/test/BUILD.gn
+++ b/android/gyp/test/BUILD.gn
@@ -1,4 +1,4 @@
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
java_library("hello_world_java") {
sources = [ "java/org/chromium/helloworld/HelloWorldPrinter.java" ]
diff --git a/android/incremental_install/BUILD.gn b/android/incremental_install/BUILD.gn
index 8d26e9622..e4727be9e 100644
--- a/android/incremental_install/BUILD.gn
+++ b/android/incremental_install/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
android_library("bootstrap_java") {
sources = [
diff --git a/android/native_flags/BUILD.gn b/android/native_flags/BUILD.gn
index 9c5be70ff..2c2184417 100644
--- a/android/native_flags/BUILD.gn
+++ b/android/native_flags/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
if (current_toolchain == default_toolchain) {
- import("//build/toolchain/toolchain.gni")
+ import("//chromium/build/toolchain/toolchain.gni")
# A toolchain that will capture compiler and linker arguments to a file.
toolchain("flagcapture") {
@@ -26,7 +26,7 @@ if (current_toolchain == default_toolchain) {
description = stamp_description
}
}
-} else if (current_toolchain == "//build/android/native_flags:flagcapture") {
+} else if (current_toolchain == "//chromium/build/android/native_flags:flagcapture") {
# This will record flags from all default configs of the default toolchain.
source_set("default_ccflags") {
sources = [ "empty.cc" ]
diff --git a/android/pylib/device/commands/BUILD.gn b/android/pylib/device/commands/BUILD.gn
index 13b69f618..64912e7ed 100644
--- a/android/pylib/device/commands/BUILD.gn
+++ b/android/pylib/device/commands/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
group("commands") {
data_deps = [ ":chromium_commands_java" ]
diff --git a/android/resource_sizes.gni b/android/resource_sizes.gni
index 2c91749c5..8a3696f70 100644
--- a/android/resource_sizes.gni
+++ b/android/resource_sizes.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/internal_rules.gni")
+import("//chromium/build/config/android/internal_rules.gni")
# Generates a script in the bin directory that runs
# //build/android/resource_sizes.py against the provided apk.
@@ -18,13 +18,13 @@ import("//build/config/android/internal_rules.gni")
template("android_resource_sizes_test") {
generate_android_wrapper(target_name) {
forward_variables_from(invoker, [ "data_deps" ])
- executable = "//build/android/resource_sizes.py"
+ executable = "//chromium/build/android/resource_sizes.py"
wrapper_script = "$root_out_dir/bin/run_${target_name}"
assert(defined(invoker.apk_name) != defined(invoker.file_path),
"Exactly one of apk_name or file_path should be provided.")
- deps = [ "//build/android:resource_sizes_py" ]
+ deps = [ "//chromium/build/android:resource_sizes_py" ]
executable_args = [
"--output-format",
"histograms",
diff --git a/android/stacktrace/BUILD.gn b/android/stacktrace/BUILD.gn
index ce13a15b4..519297f53 100644
--- a/android/stacktrace/BUILD.gn
+++ b/android/stacktrace/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
java_library("java_deobfuscate_java") {
sources = [ "java/org/chromium/build/FlushingReTrace.java" ]
diff --git a/android/test/BUILD.gn b/android/test/BUILD.gn
index b4bda3d8c..0593e2473 100644
--- a/android/test/BUILD.gn
+++ b/android/test/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/android_nocompile.gni")
+import("//chromium/build/config/android/android_nocompile.gni")
import("missing_symbol_test.gni")
import("nocompile_gn/nocompile_sources.gni")
@@ -22,7 +22,7 @@ if (enable_java_templates) {
android_nocompile_test_suite("android_lint_tests") {
# Depend on lint script so that the action is re-run whenever the script is modified.
- pydeps = [ "//build/android/gyp/lint.pydeps" ]
+ pydeps = [ "//chromium/build/android/gyp/lint.pydeps" ]
tests = [
{
diff --git a/android/test/incremental_javac_gn/BUILD.gn b/android/test/incremental_javac_gn/BUILD.gn
index 18c637448..1ad8c5dd5 100644
--- a/android/test/incremental_javac_gn/BUILD.gn
+++ b/android/test/incremental_javac_gn/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
declare_args() {
incremental_javac_test_toggle_gn = false
@@ -85,7 +85,7 @@ incremental_javac_prebuilt("no_signature_change_prebuilt_generator") {
testonly = true
sources = all_test_sources
toggle_gn_target = ":changing_java"
- pydeps = [ "//build/android/gyp/compile_java.pydeps" ]
+ pydeps = [ "//chromium/build/android/gyp/compile_java.pydeps" ]
}
android_java_prebuilt("no_signature_change_prebuilt_java") {
diff --git a/android/test/missing_symbol_test.gni b/android/test/missing_symbol_test.gni
index a11eef3cf..0b156fb6b 100644
--- a/android/test/missing_symbol_test.gni
+++ b/android/test/missing_symbol_test.gni
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/android_nocompile.gni")
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/android_nocompile.gni")
+import("//chromium/build/config/android/rules.gni")
missing_symbol_generated_importer_template_nocompile_source =
- "//build/android/java/test/missing_symbol/Importer.template"
+ "//chromium/build/android/java/test/missing_symbol/Importer.template"
template("missing_symbol_test") {
# Not named "_java" to prevent target from being considered a classpath dep.
diff --git a/android/test/nocompile_gn/BUILD.gn b/android/test/nocompile_gn/BUILD.gn
index 11feef6a4..05b6fc5c1 100644
--- a/android/test/nocompile_gn/BUILD.gn
+++ b/android/test/nocompile_gn/BUILD.gn
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/android/test/missing_symbol_test.gni")
-import("//build/config/android/android_nocompile.gni")
-import("//build/config/android/rules.gni")
+import("//chromium/build/android/test/missing_symbol_test.gni")
+import("//chromium/build/config/android/android_nocompile.gni")
+import("//chromium/build/config/android/rules.gni")
import("nocompile_sources.gni")
template("lint_test") {
@@ -24,7 +24,7 @@ template("lint_test") {
# targets. We need to test linting a normal apk target.
apk_name = _apk_target_name
deps = [ ":$_library_target_name" ]
- android_manifest = "//build/android/AndroidManifest.xml"
+ android_manifest = "//chromium/build/android/AndroidManifest.xml"
}
android_lint(target_name) {
diff --git a/android/unused_resources/BUILD.gn b/android/unused_resources/BUILD.gn
index 15961048b..bdb50fa3e 100644
--- a/android/unused_resources/BUILD.gn
+++ b/android/unused_resources/BUILD.gn
@@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
java_binary("unused_resources") {
- sources = [ "//build/android/unused_resources/UnusedResources.java" ]
+ sources = [ "//chromium/build/android/unused_resources/UnusedResources.java" ]
main_class = "build.android.unused_resources.UnusedResources"
deps = [
"//third_party/android_deps:com_android_tools_common_java",
diff --git a/apple/apple_info_plist.gni b/apple/apple_info_plist.gni
index fe51773dd..db01f5b77 100644
--- a/apple/apple_info_plist.gni
+++ b/apple/apple_info_plist.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/apple/compile_plist.gni")
+import("//chromium/build/apple/compile_plist.gni")
# The base template used to generate Info.plist files for iOS and Mac apps and
# frameworks.
diff --git a/apple/compile_entitlements.gni b/apple/compile_entitlements.gni
index 006d5ac2d..5cd6fa97d 100644
--- a/apple/compile_entitlements.gni
+++ b/apple/compile_entitlements.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/apple/compile_plist.gni")
+import("//chromium/build/apple/compile_plist.gni")
# Template to merge multiple .entitlements files performing variable
# substitutions.
diff --git a/apple/compile_plist.gni b/apple/compile_plist.gni
index 90485b6a2..6a3334da1 100644
--- a/apple/compile_plist.gni
+++ b/apple/compile_plist.gni
@@ -43,7 +43,7 @@ template("compile_plist") {
"testonly",
])
- script = "//build/apple/plist_util.py"
+ script = "//chromium/build/apple/plist_util.py"
sources = invoker.plist_templates
outputs = [ _merged_name ]
args = [
@@ -59,7 +59,7 @@ template("compile_plist") {
"testonly",
"visibility",
])
- script = "//build/apple/plist_util.py"
+ script = "//chromium/build/apple/plist_util.py"
sources = [ _merged_name ]
outputs = [ _output_name ]
args = [
diff --git a/apple/convert_plist.gni b/apple/convert_plist.gni
index a1134d9b3..6516846d1 100644
--- a/apple/convert_plist.gni
+++ b/apple/convert_plist.gni
@@ -27,7 +27,7 @@ template("convert_plist") {
"deps",
])
- script = "//build/apple/plist_util.py"
+ script = "//chromium/build/apple/plist_util.py"
sources = [ invoker.source ]
outputs = [ invoker.output ]
args = [
diff --git a/apple/tweak_info_plist.gni b/apple/tweak_info_plist.gni
index 33f22ca2d..b7daa76d5 100644
--- a/apple/tweak_info_plist.gni
+++ b/apple/tweak_info_plist.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/util/lastchange.gni")
+import("//chromium/build/util/lastchange.gni")
# Template to run the tweak_info_plist.py script on a plist.
#
@@ -36,7 +36,7 @@ template("tweak_info_plist") {
"testonly",
"deps",
])
- script = "//build/apple/plist_util.py"
+ script = "//chromium/build/apple/plist_util.py"
sources = invoker.info_plists
outputs = [ _source_name ]
args = [
@@ -62,10 +62,10 @@ template("tweak_info_plist") {
"args",
"testonly",
])
- script = "//build/apple/tweak_info_plist.py"
+ script = "//chromium/build/apple/tweak_info_plist.py"
inputs = [
script,
- "//build/util/version.py",
+ "//chromium/build/util/version.py",
lastchange_file,
"//chrome/VERSION",
]
diff --git a/args/headless.gn b/args/headless.gn
index ed6308ba2..1ff653a18 100644
--- a/args/headless.gn
+++ b/args/headless.gn
@@ -2,7 +2,7 @@
#
# Add import to arg.gn in out directory and run gn gen on the directory to use.
# E.g. for out directory out/foo:
-# echo 'import("//build/args/headless.gn")' > out/foo/args.gn
+# echo 'import("//chromium/build/args/headless.gn")' > out/foo/args.gn
# gn gen out/foo
#
# Use gn args to add your own build preference args.
diff --git a/buildflag_header.gni b/buildflag_header.gni
index 821c4efe4..50e476fa8 100644
--- a/buildflag_header.gni
+++ b/buildflag_header.gni
@@ -95,7 +95,7 @@
# }
template("buildflag_header") {
action(target_name) {
- script = "//build/write_buildflag_header.py"
+ script = "//chromium/build/write_buildflag_header.py"
if (defined(invoker.header_dir)) {
header_file = "${invoker.header_dir}/${invoker.header}"
@@ -132,6 +132,6 @@ template("buildflag_header") {
"visibility",
])
- public_deps = [ "//build:buildflag_header_h" ]
+ public_deps = [ "//chromium/build:buildflag_header_h" ]
}
}
diff --git a/cipd/cipd.gni b/cipd/cipd.gni
index e7795c106..a3b04fa16 100644
--- a/cipd/cipd.gni
+++ b/cipd/cipd.gni
@@ -122,8 +122,8 @@ template("cipd_package_definition_by_file") {
_output_yaml_filename = invoker.package_definition_yaml
}
action(target_name) {
- script = "//build/cipd/cipd_from_file.py"
- inputs = [ "//build/cipd/cipd_from_file.py" ]
+ script = "//chromium/build/cipd/cipd_from_file.py"
+ inputs = [ "//chromium/build/cipd/cipd_from_file.py" ]
args = [
"--description=" + invoker.description,
"--buildtype=" + invoker.buildtype,
diff --git a/compiled_action.gni b/compiled_action.gni
index 7e25a0b6f..22df2c538 100644
--- a/compiled_action.gni
+++ b/compiled_action.gni
@@ -98,7 +98,7 @@ template("compiled_action") {
inputs = []
}
- script = "//build/gn_run_binary.py"
+ script = "//chromium/build/gn_run_binary.py"
# Constuct the host toolchain version of the tool.
host_tool = invoker.tool + "($host_toolchain)"
@@ -144,7 +144,7 @@ template("compiled_action_foreach") {
inputs = []
}
- script = "//build/gn_run_binary.py"
+ script = "//chromium/build/gn_run_binary.py"
# Constuct the host toolchain version of the tool.
host_tool = invoker.tool + "($host_toolchain)"
diff --git a/config/BUILD.gn b/config/BUILD.gn
index 05ae8a8c9..2ee400d8d 100644
--- a/config/BUILD.gn
+++ b/config/BUILD.gn
@@ -2,26 +2,26 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/c++/c++.gni")
-import("//build/config/chrome_build.gni")
-import("//build/config/chromecast_build.gni")
-import("//build/config/crypto.gni")
-import("//build/config/dcheck_always_on.gni")
-import("//build/config/features.gni")
+import("//chromium/build/config/c++/c++.gni")
+import("//chromium/build/config/chrome_build.gni")
+import("//chromium/build/config/chromecast_build.gni")
+import("//chromium/build/config/crypto.gni")
+import("//chromium/build/config/dcheck_always_on.gni")
+import("//chromium/build/config/features.gni")
# Subprojects need to override arguments in {mac,ios}_sdk_overrides.gni in their
# .gn config, but those arguments are only used on macOS. Including
# mac_sdk_overrides.gni insures that this doesn't trigger an unused argument
# warning.
-import("//build/config/ios/ios_sdk_overrides.gni")
-import("//build/config/mac/mac_sdk_overrides.gni")
+import("//chromium/build/config/ios/ios_sdk_overrides.gni")
+import("//chromium/build/config/mac/mac_sdk_overrides.gni")
-import("//build/config/pch.gni")
-import("//build/config/sanitizers/sanitizers.gni")
-import("//build/config/ui.gni")
-import("//build/toolchain/goma.gni")
+import("//chromium/build/config/pch.gni")
+import("//chromium/build/config/sanitizers/sanitizers.gni")
+import("//chromium/build/config/ui.gni")
+import("//chromium/build/toolchain/goma.gni")
if (is_android) {
- import("//build/config/android/abi.gni")
+ import("//chromium/build/config/android/abi.gni")
}
# ==============================================
@@ -247,7 +247,7 @@ group("common_deps") {
public_deps = []
if (using_sanitizer) {
- public_deps += [ "//build/config/sanitizers:deps" ]
+ public_deps += [ "//chromium/build/config/sanitizers:deps" ]
}
#if (use_custom_libcxx) {
@@ -291,8 +291,8 @@ group("shared_library_deps") {
# Windows linker setup for EXEs and DLLs.
if (is_win) {
_windows_linker_configs = [
- "//build/config/win:sdk_link",
- "//build/config/win:common_linker_setup",
+ "//chromium/build/config/win:sdk_link",
+ "//chromium/build/config/win:common_linker_setup",
]
}
@@ -303,18 +303,18 @@ config("executable_config") {
if (is_win) {
configs += _windows_linker_configs
} else if (is_mac) {
- configs += [ "//build/config/mac:mac_dynamic_flags" ]
+ configs += [ "//chromium/build/config/mac:mac_dynamic_flags" ]
} else if (is_ios) {
configs += [
- "//build/config/ios:ios_dynamic_flags",
- "//build/config/ios:ios_executable_flags",
+ "//chromium/build/config/ios:ios_dynamic_flags",
+ "//chromium/build/config/ios:ios_executable_flags",
]
} else if (is_linux || is_chromeos || is_android || current_os == "aix") {
- configs += [ "//build/config/gcc:executable_config" ]
+ configs += [ "//chromium/build/config/gcc:executable_config" ]
if (is_chromecast) {
- configs += [ "//build/config/chromecast:executable_config" ]
+ configs += [ "//chromium/build/config/chromecast:executable_config" ]
} else if (is_fuchsia) {
- configs += [ "//build/config/fuchsia:executable_config" ]
+ configs += [ "//chromium/build/config/fuchsia:executable_config" ]
}
}
@@ -326,7 +326,7 @@ config("executable_config") {
if (use_locally_built_instrumented_libraries) {
configs += [ "//third_party/instrumented_libraries:locally_built_ldflags" ]
}
- configs += [ "//build/config/sanitizers:link_executable" ]
+ configs += [ "//chromium/build/config/sanitizers:link_executable" ]
}
# Shared library configs -------------------------------------------------------
@@ -338,16 +338,16 @@ config("shared_library_config") {
if (is_win) {
configs += _windows_linker_configs
} else if (is_mac) {
- configs += [ "//build/config/mac:mac_dynamic_flags" ]
+ configs += [ "//chromium/build/config/mac:mac_dynamic_flags" ]
} else if (is_ios) {
configs += [
- "//build/config/ios:ios_dynamic_flags",
- "//build/config/ios:ios_shared_library_flags",
+ "//chromium/build/config/ios:ios_dynamic_flags",
+ "//chromium/build/config/ios:ios_shared_library_flags",
]
} else if (is_chromecast) {
- configs += [ "//build/config/chromecast:shared_library_config" ]
+ configs += [ "//chromium/build/config/chromecast:shared_library_config" ]
} else if (is_linux || is_chromeos || current_os == "aix") {
- configs += [ "//build/config/gcc:shared_library_config" ]
+ configs += [ "//chromium/build/config/gcc:shared_library_config" ]
}
# If we're using the prebuilt instrumented libraries with the sanitizers, we
@@ -358,7 +358,7 @@ config("shared_library_config") {
if (use_locally_built_instrumented_libraries) {
configs += [ "//third_party/instrumented_libraries:locally_built_ldflags" ]
}
- configs += [ "//build/config/sanitizers:link_shared_library" ]
+ configs += [ "//chromium/build/config/sanitizers:link_shared_library" ]
}
# Add this config to your target to enable precompiled headers.
@@ -380,12 +380,12 @@ config("precompiled_headers") {
# This is a file that GN will compile with the above header. It will be
# implicitly added to the sources (potentially multiple times, with one
# variant for each language used in the target).
- precompiled_source = "//build/precompile.cc"
+ precompiled_source = "//chromium/build/precompile.cc"
# Force include the header.
cflags = [ "/FI$precompiled_header" ]
} else if (is_mac || is_linux) {
- precompiled_source = "//build/precompile.h"
+ precompiled_source = "//chromium/build/precompile.h"
}
}
}
diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
index 571ae5f0d..889bdb923 100644
--- a/config/BUILDCONFIG.gn
+++ b/config/BUILDCONFIG.gn
@@ -186,31 +186,31 @@ if (host_toolchain == "") {
if (host_os == "linux" || host_os == "openbsd") {
if (target_os != "linux") {
- host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
+ host_toolchain = "//chromium/build/toolchain/linux:clang_$host_cpu"
} else if (is_clang) {
- host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
+ host_toolchain = "//chromium/build/toolchain/linux:clang_$host_cpu"
} else {
- host_toolchain = "//build/toolchain/linux:$host_cpu"
+ host_toolchain = "//chromium/build/toolchain/linux:$host_cpu"
}
} else if (host_os == "mac") {
- host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
+ host_toolchain = "//chromium/build/toolchain/mac:clang_$host_cpu"
} else if (host_os == "win") {
# On Windows always use the target CPU for host builds for x86/x64. On the
# configurations we support this will always work and it saves build steps.
# Windows ARM64 targets require an x64 host for cross build.
if (target_cpu == "x86" || target_cpu == "x64") {
if (is_clang) {
- host_toolchain = "//build/toolchain/win:win_clang_$target_cpu"
+ host_toolchain = "//chromium/build/toolchain/win:win_clang_$target_cpu"
} else {
- host_toolchain = "//build/toolchain/win:$target_cpu"
+ host_toolchain = "//chromium/build/toolchain/win:$target_cpu"
}
} else if (is_clang) {
- host_toolchain = "//build/toolchain/win:win_clang_$host_cpu"
+ host_toolchain = "//chromium/build/toolchain/win:win_clang_$host_cpu"
} else {
- host_toolchain = "//build/toolchain/win:$host_cpu"
+ host_toolchain = "//chromium/build/toolchain/win:$host_cpu"
}
} else if (host_os == "aix") {
- host_toolchain = "//build/toolchain/aix:$host_cpu"
+ host_toolchain = "//chromium/build/toolchain/aix:$host_cpu"
} else {
assert(false, "Unsupported host_os: $host_os")
}
@@ -221,38 +221,38 @@ _default_toolchain = ""
if (target_os == "android") {
assert(host_os == "linux" || host_os == "mac",
"Android builds are only supported on Linux and Mac hosts.")
- _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/android:android_clang_$target_cpu"
} else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") {
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
if (is_clang) {
- _default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/linux:clang_$target_cpu"
} else {
- _default_toolchain = "//build/toolchain/linux:$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/linux:$target_cpu"
}
} else if (target_os == "fuchsia") {
- _default_toolchain = "//build/toolchain/fuchsia:$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/fuchsia:$target_cpu"
} else if (target_os == "ios") {
- _default_toolchain = "//build/toolchain/ios:ios_clang_$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/ios:ios_clang_$target_cpu"
} else if (target_os == "mac") {
#assert(host_os == "mac" || host_os == "linux",
# "Mac cross-compiles are unsupported.")
- _default_toolchain = "//build/toolchain/mac:clang_$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/mac:clang_$target_cpu"
} else if (target_os == "win") {
# On Windows, we use the same toolchain for host and target by default.
# Beware, win cross builds have some caveats, see docs/win_cross.md
if (is_clang) {
- _default_toolchain = "//build/toolchain/win:win_clang_$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/win:win_clang_$target_cpu"
} else {
- _default_toolchain = "//build/toolchain/win:$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/win:$target_cpu"
}
} else if (target_os == "winuwp") {
# Only target WinUWP on for a Windows store application and only
# x86, x64 and arm are supported target CPUs.
assert(target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm" ||
target_cpu == "arm64")
- _default_toolchain = "//build/toolchain/win:uwp_$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/win:uwp_$target_cpu"
} else if (target_os == "aix") {
- _default_toolchain = "//build/toolchain/aix:$target_cpu"
+ _default_toolchain = "//chromium/build/toolchain/aix:$target_cpu"
} else {
assert(false, "Unsupported target_os: $target_os")
}
@@ -315,70 +315,70 @@ is_posix = !is_win && !is_fuchsia
# Holds all configs used for running the compiler.
default_compiler_configs = [
- "//build/config:feature_flags",
- "//build/config/compiler:afdo",
- "//build/config/compiler:afdo_optimize_size",
- "//build/config/compiler:cet_shadow_stack",
- "//build/config/compiler:compiler",
- "//build/config/compiler:compiler_arm_fpu",
- "//build/config/compiler:compiler_arm_thumb",
- "//build/config/compiler:chromium_code",
- "//build/config/compiler:default_include_dirs",
- "//build/config/compiler:default_optimization",
- "//build/config/compiler:default_stack_frames",
- "//build/config/compiler:default_symbols",
- "//build/config/compiler:export_dynamic",
- "//build/config/compiler:no_exceptions",
- "//build/config/compiler:no_rtti",
- "//build/config/compiler:runtime_library",
- "//build/config/compiler:thin_archive",
- "//build/config/compiler:thinlto_optimize_default",
- "//build/config/compiler:default_init_stack_vars",
- "//build/config/compiler:no_unresolved_symbols",
- "//build/config/compiler/pgo:default_pgo_flags",
- "//build/config/coverage:default_coverage",
- "//build/config/sanitizers:default_sanitizer_flags",
+ "//chromium/build/config:feature_flags",
+ "//chromium/build/config/compiler:afdo",
+ "//chromium/build/config/compiler:afdo_optimize_size",
+ "//chromium/build/config/compiler:cet_shadow_stack",
+ "//chromium/build/config/compiler:compiler",
+ "//chromium/build/config/compiler:compiler_arm_fpu",
+ "//chromium/build/config/compiler:compiler_arm_thumb",
+ "//chromium/build/config/compiler:chromium_code",
+ "//chromium/build/config/compiler:default_include_dirs",
+ "//chromium/build/config/compiler:default_optimization",
+ "//chromium/build/config/compiler:default_stack_frames",
+ "//chromium/build/config/compiler:default_symbols",
+ "//chromium/build/config/compiler:export_dynamic",
+ "//chromium/build/config/compiler:no_exceptions",
+ "//chromium/build/config/compiler:no_rtti",
+ "//chromium/build/config/compiler:runtime_library",
+ "//chromium/build/config/compiler:thin_archive",
+ "//chromium/build/config/compiler:thinlto_optimize_default",
+ "//chromium/build/config/compiler:default_init_stack_vars",
+ "//chromium/build/config/compiler:no_unresolved_symbols",
+ "//chromium/build/config/compiler/pgo:default_pgo_flags",
+ "//chromium/build/config/coverage:default_coverage",
+ "//chromium/build/config/sanitizers:default_sanitizer_flags",
]
if (is_win) {
default_compiler_configs += [
- "//build/config/win:default_cfg_compiler",
- "//build/config/win:default_crt",
- "//build/config/win:lean_and_mean",
- "//build/config/win:nominmax",
- "//build/config/win:unicode",
- "//build/config/win:winver",
+ "//chromium/build/config/win:default_cfg_compiler",
+ "//chromium/build/config/win:default_crt",
+ "//chromium/build/config/win:lean_and_mean",
+ "//chromium/build/config/win:nominmax",
+ "//chromium/build/config/win:unicode",
+ "//chromium/build/config/win:winver",
]
}
if (is_posix) {
if (current_os != "aix") {
default_compiler_configs +=
- [ "//build/config/gcc:symbol_visibility_hidden" ]
+ [ "//chromium/build/config/gcc:symbol_visibility_hidden" ]
}
}
if (is_fuchsia) {
- default_compiler_configs += [ "//build/config/gcc:symbol_visibility_hidden" ]
+ default_compiler_configs += [ "//chromium/build/config/gcc:symbol_visibility_hidden" ]
}
if (is_android) {
default_compiler_configs +=
- [ "//build/config/android:default_orderfile_instrumentation" ]
+ [ "//chromium/build/config/android:default_orderfile_instrumentation" ]
}
if (is_clang && !is_nacl) {
default_compiler_configs += [
- "//build/config/clang:find_bad_constructs",
- "//build/config/clang:extra_warnings",
+ "//chromium/build/config/clang:find_bad_constructs",
+ "//chromium/build/config/clang:extra_warnings",
]
}
# Debug/release-related defines.
if (is_debug) {
- default_compiler_configs += [ "//build/config:debug" ]
+ default_compiler_configs += [ "//chromium/build/config:debug" ]
} else {
- default_compiler_configs += [ "//build/config:release" ]
+ default_compiler_configs += [ "//chromium/build/config:release" ]
}
# Static libraries and source sets use only the compiler ones.
@@ -401,28 +401,28 @@ if (is_win) {
# Many targets remove these configs, so they are not contained within
# //build/config:executable_config for easy removal.
_linker_configs = [
- "//build/config/win:default_incremental_linking",
+ "//chromium/build/config/win:default_incremental_linking",
# Default to console-mode apps. Most of our targets are tests and such
# that shouldn't use the windows subsystem.
- "//build/config/win:console",
+ "//chromium/build/config/win:console",
]
} else if (is_mac) {
- _linker_configs = [ "//build/config/mac:strip_all" ]
+ _linker_configs = [ "//chromium/build/config/mac:strip_all" ]
} else {
_linker_configs = []
}
# Executable defaults.
default_executable_configs = default_compiler_configs + [
- "//build/config:default_libs",
- "//build/config:executable_config",
+ "//chromium/build/config:default_libs",
+ "//chromium/build/config:executable_config",
] + _linker_configs
if (is_win) {
# Turn on linker CFI for executables, and position it so it can be removed
# if needed.
- default_executable_configs += [ "//build/config/win:cfi_linker" ]
+ default_executable_configs += [ "//chromium/build/config/win:cfi_linker" ]
}
set_defaults("executable") {
@@ -432,19 +432,19 @@ set_defaults("executable") {
# Shared library and loadable module defaults (also for components in component
# mode).
default_shared_library_configs = default_compiler_configs + [
- "//build/config:default_libs",
- "//build/config:shared_library_config",
+ "//chromium/build/config:default_libs",
+ "//chromium/build/config:shared_library_config",
] + _linker_configs
if (is_win) {
# Turn on linker CFI for DLLs, and position it so it can be removed if needed.
- default_shared_library_configs += [ "//build/config/win:cfi_linker" ]
+ default_shared_library_configs += [ "//chromium/build/config/win:cfi_linker" ]
}
if (is_android) {
# Strip native JNI exports from shared libraries by default. Binaries that
# want this can remove this config.
default_shared_library_configs +=
- [ "//build/config/android:hide_all_but_jni_onload" ]
+ [ "//chromium/build/config/android:hide_all_but_jni_onload" ]
}
set_defaults("shared_library") {
configs = default_shared_library_configs
@@ -454,7 +454,7 @@ set_defaults("loadable_module") {
# loadable_modules are generally used by other libs, not just via JNI.
if (is_android) {
- configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+ configs -= [ "//chromium/build/config/android:hide_all_but_jni_onload" ]
}
}
@@ -475,8 +475,8 @@ TESTONLY_AND_VISIBILITY = [
# Variables
# no_default_deps: If true, no standard dependencies will be added.
# Targets that set this usually also want to remove
-# "//build/config/compiler:runtime_library" from configs (to remove
-# its subconfig "//build/config/c++:runtime_library").
+# "//chromium/build/config/compiler:runtime_library" from configs (to remove
+# its subconfig "//chromium/build/config/c++:runtime_library").
foreach(_target_type,
[
"executable",
@@ -501,7 +501,7 @@ foreach(_target_type,
# //build/config:shared_library_deps
# (This explicit list is so that grepping for these configs finds where
# they are used.)
- deps += [ "//build/config:${_target_type}_deps" ]
+ deps += [ "//chromium/build/config:${_target_type}_deps" ]
}
# On Android, write shared library output file to metadata. We will use
@@ -580,7 +580,7 @@ set_defaults("component") {
if (is_component_build) {
configs = default_shared_library_configs
if (is_android) {
- configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+ configs -= [ "//chromium/build/config/android:hide_all_but_jni_onload" ]
}
} else {
configs = default_compiler_configs
diff --git a/config/aix/BUILD.gn b/config/aix/BUILD.gn
index 9079f6f53..99cc7bbf4 100644
--- a/config/aix/BUILD.gn
+++ b/config/aix/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/sanitizers/sanitizers.gni")
-import("//build/toolchain/toolchain.gni")
+import("//chromium/build/config/sanitizers/sanitizers.gni")
+import("//chromium/build/toolchain/toolchain.gni")
# This is included by reference in the //build/config/compiler config that
# is applied to all targets. It is here to separate out the logic.
diff --git a/config/android/BUILD.gn b/config/android/BUILD.gn
index 85d27ea89..2f7c7bcc0 100644
--- a/config/android/BUILD.gn
+++ b/config/android/BUILD.gn
@@ -2,13 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/config.gni")
-import("//build/config/c++/c++.gni")
-import("//build/config/compiler/compiler.gni")
-import("//build/config/sanitizers/sanitizers.gni")
+import("//chromium/build/config/android/config.gni")
+import("//chromium/build/config/c++/c++.gni")
+import("//chromium/build/config/compiler/compiler.gni")
+import("//chromium/build/config/sanitizers/sanitizers.gni")
if (current_toolchain == default_toolchain) {
- import("//build/toolchain/concurrent_links.gni")
+ import("//chromium/build/toolchain/concurrent_links.gni")
}
assert(is_android)
@@ -111,13 +111,13 @@ config("runtime_library") {
config("hide_all_but_jni_onload") {
ldflags = [ "-Wl,--version-script=" + rebase_path(
- "//build/android/android_only_explicit_jni_exports.lst",
+ "//chromium/build/android/android_only_explicit_jni_exports.lst",
root_build_dir) ]
}
config("hide_all_but_jni") {
ldflags = [ "-Wl,--version-script=" +
- rebase_path("//build/android/android_only_jni_exports.lst",
+ rebase_path("//chromium/build/android/android_only_jni_exports.lst",
root_build_dir) ]
}
diff --git a/config/android/abi.gni b/config/android/abi.gni
index 1dbbf0cd6..364a06b29 100644
--- a/config/android/abi.gni
+++ b/config/android/abi.gni
@@ -45,7 +45,7 @@ if (target_cpu == "x86") {
android_app_abi = "x86"
android_abi_target = "i686-linux-android"
} else if (target_cpu == "arm") {
- import("//build/config/arm.gni")
+ import("//chromium/build/config/arm.gni")
if (arm_version < 7) {
android_app_abi = "armeabi"
} else {
@@ -97,5 +97,5 @@ if (target_cpu == "arm64") {
if (defined(android_secondary_abi_cpu)) {
android_secondary_abi_toolchain =
- "//build/toolchain/android:android_clang_${android_secondary_abi_cpu}"
+ "//chromium/build/toolchain/android:android_clang_${android_secondary_abi_cpu}"
}
diff --git a/config/android/android_nocompile.gni b/config/android/android_nocompile.gni
index 8ffca0e13..54bed4597 100644
--- a/config/android/android_nocompile.gni
+++ b/config/android/android_nocompile.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
declare_args() {
# Used by tests to enable generating build files for GN targets which should
@@ -33,7 +33,7 @@ template("android_nocompile_test_suite") {
action(target_name) {
testonly = true
- script = "//build/android/gyp/nocompile_test.py"
+ script = "//chromium/build/android/gyp/nocompile_test.py"
_tests = invoker.tests
_test0 = _tests[0]
@@ -57,7 +57,7 @@ template("android_nocompile_test_suite") {
# Depend on compile_java Python scripts so that the action is re-run whenever the script is
# modified.
- _pydeps = [ "//build/android/gyp/compile_java.pydeps" ]
+ _pydeps = [ "//chromium/build/android/gyp/compile_java.pydeps" ]
if (defined(invoker.pydeps)) {
_pydeps += invoker.pydeps
}
diff --git a/config/android/build_vars.gni b/config/android/build_vars.gni
index a47607dc7..3c09ce0f0 100644
--- a/config/android/build_vars.gni
+++ b/config/android/build_vars.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/config.gni")
+import("//chromium/build/config/android/config.gni")
# Contains useful GN variables that may be used by scripts that take
# --output-directory as an arg.
diff --git a/config/android/config.gni b/config/android/config.gni
index 13418299e..1a1667f06 100644
--- a/config/android/config.gni
+++ b/config/android/config.gni
@@ -8,8 +8,8 @@
# toolchain, this GNI file may be read and processed from within Chrome OS
# toolchains. Checking |is_android| here would therefore be too restrictive.
if (is_android || is_chromeos) {
- import("//build/config/chromecast_build.gni")
- import("//build/config/dcheck_always_on.gni")
+ import("//chromium/build/config/chromecast_build.gni")
+ import("//chromium/build/config/dcheck_always_on.gni")
import("//build_overrides/build.gni")
import("abi.gni")
@@ -17,7 +17,7 @@ if (is_android || is_chromeos) {
# Some non-chromium projects (e.g. WebRTC) use our build configs
# heavily but don't write gclient args files.
- import("//build/config/gclient_args.gni")
+ import("//chromium/build/config/gclient_args.gni")
if (defined(checkout_android_native_support)) {
n = "$0x0A" # Newline
assert(checkout_android_native_support,
@@ -31,7 +31,7 @@ if (is_android || is_chromeos) {
}
has_chrome_android_internal =
- exec_script("//build/dir_exists.py",
+ exec_script("//chromium/build/dir_exists.py",
[ rebase_path("//clank", root_build_dir) ],
"string") == "True"
@@ -72,7 +72,7 @@ if (is_android || is_chromeos) {
if (enable_chrome_android_internal) {
import("//clank/config.gni")
} else {
- import("//build/config/android/sdk.gni")
+ import("//chromium/build/config/android/sdk.gni")
declare_args() {
# Which Android SDK to use.
android_sdk_release = default_android_sdk_release
@@ -116,7 +116,7 @@ if (is_android || is_chromeos) {
}
if (!defined(default_android_keystore_path)) {
- default_android_keystore_path = "//build/android/chromium-debug.keystore"
+ default_android_keystore_path = "//chromium/build/android/chromium-debug.keystore"
default_android_keystore_name = "chromiumdebugkey"
default_android_keystore_password = "chromium"
}
diff --git a/config/android/copy_ex.gni b/config/android/copy_ex.gni
index d3705dd7e..1e64aecbd 100644
--- a/config/android/copy_ex.gni
+++ b/config/android/copy_ex.gni
@@ -19,7 +19,7 @@
# The following variables have the usual GN meaning: data, deps, inputs,
# outputs, testonly, visibility.
-import("//build/config/python.gni")
+import("//chromium/build/config/python.gni")
template("copy_ex") {
action_with_pydeps(target_name) {
@@ -43,7 +43,7 @@ template("copy_ex") {
inputs = invoker.inputs
}
- script = "//build/android/gyp/copy_ex.py"
+ script = "//chromium/build/android/gyp/copy_ex.py"
args = [
"--dest",
diff --git a/config/android/extract_unwind_tables.gni b/config/android/extract_unwind_tables.gni
index 5444c5b97..edec145f0 100644
--- a/config/android/extract_unwind_tables.gni
+++ b/config/android/extract_unwind_tables.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/android/rules.gni")
+import("//chromium/build/config/android/rules.gni")
template("unwind_table_asset") {
# Note: This file name is used in multiple monochrome build scripts.
@@ -18,7 +18,7 @@ template("unwind_table_asset") {
"root_out_dir")
}
- script = "//build/android/gyp/extract_unwind_tables.py"
+ script = "//chromium/build/android/gyp/extract_unwind_tables.py"
outputs = [ _asset_path ]
inputs = [ "${_root_dir}/lib.unstripped/$shlib_prefix${invoker.library_target}$shlib_extension" ]
diff --git a/config/android/internal_rules.gni b/config/android/internal_rules.gni
index 3ed306a9e..9ec34e9fa 100644
--- a/config/android/internal_rules.gni
+++ b/config/android/internal_rules.gni
@@ -4,19 +4,19 @@
# Do not add any imports to non-//build directories here.
# Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
-import("//build/config/android/config.gni")
-import("//build/config/android/copy_ex.gni")
-import("//build/config/compiler/compiler.gni")
-import("//build/config/compute_inputs_for_analyze.gni")
-import("//build/config/coverage/coverage.gni")
-import("//build/config/python.gni")
-import("//build/config/sanitizers/sanitizers.gni")
-import("//build/toolchain/goma.gni")
-import("//build/toolchain/kythe.gni")
-import("//build/util/generate_wrapper.gni")
+import("//chromium/build/config/android/config.gni")
+import("//chromium/build/config/android/copy_ex.gni")
+import("//chromium/build/config/compiler/compiler.gni")
+import("//chromium/build/config/compute_inputs_for_analyze.gni")
+import("//chromium/build/config/coverage/coverage.gni")
+import("//chromium/build/config/python.gni")
+import("//chromium/build/config/sanitizers/sanitizers.gni")
+import("//chromium/build/toolchain/goma.gni")
+import("//chromium/build/toolchain/kythe.gni")
+import("//chromium/build/util/generate_wrapper.gni")
import("//build_overrides/build.gni")
if (current_toolchain == default_toolchain) {
- import("//build/toolchain/concurrent_links.gni")
+ import("//chromium/build/toolchain/concurrent_links.gni")
}
assert(is_android)
@@ -190,7 +190,7 @@ template("write_build_config") {
deps += [ invoker.android_manifest_dep ]
}
- script = "//build/android/gyp/write_build_config.py"
+ script = "//chromium/build/android/gyp/write_build_config.py"
depfile = "$target_gen_dir/$target_name.d"
inputs = []
outputs = [ invoker.build_config ]
@@ -638,11 +638,11 @@ template("generate_android_wrapper") {
generate_wrapper(target_name) {
forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY)
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
- generator_script = "//build/android/gyp/generate_android_wrapper.py"
+ generator_script = "//chromium/build/android/gyp/generate_android_wrapper.py"
sources = [
- "//build/android/gyp/util/build_utils.py",
- "//build/gn_helpers.py",
- "//build/util/generate_wrapper.py",
+ "//chromium/build/android/gyp/util/build_utils.py",
+ "//chromium/build/gn_helpers.py",
+ "//chromium/build/util/generate_wrapper.py",
]
}
}
@@ -670,7 +670,7 @@ template("generate_r_java") {
inputs = [ invoker.build_config ]
outputs = [ invoker.srcjar_path ]
_rebased_build_config = rebase_path(invoker.build_config, root_build_dir)
- script = "//build/android/gyp/create_r_java.py"
+ script = "//chromium/build/android/gyp/create_r_java.py"
args = [
"--depfile",
rebase_path(depfile, root_build_dir),
@@ -739,7 +739,7 @@ template("test_runner_script") {
if (defined(android_test_runner_script)) {
_runner_script = android_test_runner_script
} else {
- _runner_script = "//build/android/test_runner.py"
+ _runner_script = "//chromium/build/android/test_runner.py"
}
deps = []
@@ -747,7 +747,7 @@ template("test_runner_script") {
deps = invoker.deps
}
data_deps = [
- "//build/android:test_runner_py",
+ "//chromium/build/android:test_runner_py",
"//testing:test_scripts_shared",
]
if (defined(invoker.data_deps)) {
@@ -992,9 +992,9 @@ if (enable_java_templates) {
# https://crbug.com/1098752 Fix for bot OOM (https://crbug.com/1098333).
if (defined(java_cmd_pool_size)) {
- pool = "//build/config/android:java_cmd_pool($default_toolchain)"
+ pool = "//chromium/build/config/android:java_cmd_pool($default_toolchain)"
} else {
- pool = "//build/toolchain:link_pool($default_toolchain)"
+ pool = "//chromium/build/toolchain:link_pool($default_toolchain)"
}
# Lint requires generated sources and generated resources from the build.
@@ -1031,7 +1031,7 @@ if (enable_java_templates) {
_lint_gen_dir = "$target_gen_dir/$target_name"
_backported_methods = "//third_party/r8/backported_methods.txt"
- script = "//build/android/gyp/lint.py"
+ script = "//chromium/build/android/gyp/lint.py"
depfile = "$target_gen_dir/$target_name.d"
inputs = [
_lint_binary_path,
@@ -1108,7 +1108,7 @@ if (enable_java_templates) {
} else {
_stamp_path = "$target_out_dir/$target_name/build.lint.stamp"
deps += [
- "//build/android:prepare_android_lint_cache",
+ "//chromium/build/android:prepare_android_lint_cache",
invoker.build_config_dep,
]
inputs += [ invoker.build_config ]
@@ -1147,7 +1147,7 @@ if (enable_java_templates) {
"data_deps",
"public_deps",
])
- _script = "//build/android/gyp/proguard.py"
+ _script = "//chromium/build/android/gyp/proguard.py"
_deps = invoker.deps
_inputs = [
@@ -1357,9 +1357,9 @@ if (enable_java_templates) {
# http://crbug.com/725224. Fix for bots running out of memory.
if (defined(java_cmd_pool_size)) {
- pool = "//build/config/android:java_cmd_pool($default_toolchain)"
+ pool = "//chromium/build/config/android:java_cmd_pool($default_toolchain)"
} else {
- pool = "//build/toolchain:link_pool($default_toolchain)"
+ pool = "//chromium/build/toolchain:link_pool($default_toolchain)"
}
}
}
@@ -1381,7 +1381,7 @@ if (enable_java_templates) {
_build_config = invoker.build_config
_script_name = invoker.script_name
- script = "//build/android/gyp/create_java_binary_script.py"
+ script = "//chromium/build/android/gyp/create_java_binary_script.py"
inputs = [ _build_config ]
_java_script = "$root_build_dir/bin/$_script_name"
outputs = [ _java_script ]
@@ -1460,7 +1460,7 @@ if (enable_java_templates) {
"apply_mapping can only be specified if proguard is enabled.")
if (_enable_main_dex_list) {
- _main_dex_rules = "//build/android/main_dex_classes.flags"
+ _main_dex_rules = "//chromium/build/android/main_dex_classes.flags"
}
if (_desugar_needs_classpath || _proguard_enabled) {
@@ -1573,7 +1573,7 @@ if (enable_java_templates) {
"data",
"data_deps",
])
- script = "//build/android/gyp/dex.py"
+ script = "//chromium/build/android/gyp/dex.py"
deps = _deps
depfile = "$target_gen_dir/$target_name.d"
outputs = [ invoker.output ]
@@ -1585,9 +1585,9 @@ if (enable_java_templates) {
if (!_is_library) {
# http://crbug.com/725224. Fix for bots running out of memory.
if (defined(java_cmd_pool_size)) {
- pool = "//build/config/android:java_cmd_pool($default_toolchain)"
+ pool = "//chromium/build/config/android:java_cmd_pool($default_toolchain)"
} else {
- pool = "//build/toolchain:link_pool($default_toolchain)"
+ pool = "//chromium/build/toolchain:link_pool($default_toolchain)"
}
}
@@ -1742,7 +1742,7 @@ if (enable_java_templates) {
# min_sdk_version: The minimum Android SDK version this target supports.
template("dex_jdk_libs") {
action_with_pydeps(target_name) {
- script = "//build/android/gyp/dex_jdk_libs.py"
+ script = "//chromium/build/android/gyp/dex_jdk_libs.py"
inputs = [
_r8_path,
_desugar_jdk_libs_json,
@@ -1782,7 +1782,7 @@ if (enable_java_templates) {
_sources_json_file = "$target_out_dir/${target_name}__jacoco_sources.json"
_jacococli_jar = "//third_party/jacoco/lib/jacococli.jar"
- script = "//build/android/gyp/jacoco_instr.py"
+ script = "//chromium/build/android/gyp/jacoco_instr.py"
inputs = invoker.java_files + [
_jacococli_jar,
invoker.input_jar_path,
@@ -1814,7 +1814,7 @@ if (enable_java_templates) {
template("filter_jar") {
action_with_pydeps(target_name) {
- script = "//build/android/gyp/filter_zip.py"
+ script = "//chromium/build/android/gyp/filter_zip.py"
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY + [ "deps" ])
inputs = [ invoker.input_jar ]
if (defined(invoker.inputs)) {
@@ -1852,7 +1852,7 @@ if (enable_java_templates) {
_desugar_output_jar = "$target_out_dir/$target_name.desugar.jar"
action_with_pydeps(_desugar_target) {
- script = "//build/android/gyp/desugar.py"
+ script = "//chromium/build/android/gyp/desugar.py"
deps = _deps + invoker.classpath_deps
depfile = "$target_gen_dir/$target_name.d"
_rebased_build_config =
@@ -1939,7 +1939,7 @@ if (enable_java_templates) {
action_with_pydeps(target_name) {
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
_bytecode_checker_script = "$root_build_dir/bin/helper/bytecode_processor"
- script = "//build/android/gyp/bytecode_processor.py"
+ script = "//chromium/build/android/gyp/bytecode_processor.py"
inputs = [
invoker.build_config,
invoker.input_jar,
@@ -1948,7 +1948,7 @@ if (enable_java_templates) {
--> --------------------
--> maximum size reached
--> --------------------
[ Dauer der Verarbeitung: 0.18 Sekunden
(vorverarbeitet)
]
|
2026-04-04
|
|
|
|
|
