Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ B = "${S}/${OUTPUT_DIR}"

# Backported patches.
SRC_URI += "\
file://backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch \
file://backport/IWYU-for-content-browser-generic_sensor-fra.patch \
file://backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch \
file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
file://backport/six-Update-vendored-copy-of-six-to-1.16.0.patch \
file://backport/ToTLinux-Fix-some-narrowing-errors.patch \
file://backport/Update-LegacyStatsCollector-to-conform-with.patch \
"
# Non-specific patches.
SRC_URI += "\
Expand All @@ -36,9 +30,8 @@ SRC_URI += "\
# ARM/AArch64-specific patches.
SRC_URI:append:arm = "\
file://arm/0001-BUILD-do-not-specify-march-on-arm.patch \
file://arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch \
"
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"

# musl-specific patches.
SRC_URI:append:libc-musl = "\
Expand Down
72 changes: 67 additions & 5 deletions meta-chromium/recipes-browser/chromium/chromium.inc

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
1 file changed, 38 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index de1cd6e..38b8167 100644
index 89b4755..f7ba313 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1175,11 +1175,6 @@ config("compiler_cpu_abi") {
@@ -1174,11 +1174,6 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
Expand All @@ -36,7 +36,7 @@ index de1cd6e..38b8167 100644
if (!is_nacl) {
cflags += [
"-march=$arm_arch",
@@ -1189,12 +1184,6 @@ config("compiler_cpu_abi") {
@@ -1188,12 +1183,6 @@ config("compiler_cpu_abi") {
if (arm_tune != "") {
cflags += [ "-mtune=$arm_tune" ]
}
Expand All @@ -49,7 +49,7 @@ index de1cd6e..38b8167 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1202,9 +1191,6 @@ config("compiler_cpu_abi") {
@@ -1201,9 +1190,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mipsel-linux-android" ]
ldflags += [ "--target=mipsel-linux-android" ]
Expand All @@ -59,7 +59,7 @@ index de1cd6e..38b8167 100644
}
} else {
cflags += [ "-EL" ]
@@ -1284,8 +1270,6 @@ config("compiler_cpu_abi") {
@@ -1283,8 +1269,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -68,7 +68,7 @@ index de1cd6e..38b8167 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1333,9 +1317,6 @@ config("compiler_cpu_abi") {
@@ -1332,9 +1316,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mips64el-linux-android" ]
ldflags += [ "--target=mips64el-linux-android" ]
Expand All @@ -78,7 +78,7 @@ index de1cd6e..38b8167 100644
}
} else {
cflags += [
@@ -1393,8 +1374,6 @@ config("compiler_cpu_abi") {
@@ -1392,8 +1373,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -87,7 +87,7 @@ index de1cd6e..38b8167 100644
} else {
cflags += [
"-EB",
@@ -1557,23 +1536,6 @@ config("compiler_deterministic") {
@@ -1556,23 +1535,6 @@ config("compiler_deterministic") {
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@ index 52504f4..40425d6 100644
"root_out_dir") +
"/v8_context_snapshot_generator",
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
index f0976f9..99304bb 100644
index bc087fd..f5b0f48 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2162,6 +2162,7 @@ template("run_torque") {
@@ -2169,6 +2169,7 @@ template("run_torque") {
}

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
root_build_dir),
@@ -2319,6 +2320,7 @@ action("generate_bytecode_builtins_list") {
@@ -2326,6 +2327,7 @@ action("generate_bytecode_builtins_list") {
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(
":bytecode_builtins_list_generator($v8_generator_toolchain)",
@@ -2358,6 +2360,7 @@ template("run_mksnapshot") {
@@ -2365,6 +2367,7 @@ template("run_mksnapshot") {
data = []

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
"root_out_dir") + "/mksnapshot",
root_build_dir),
@@ -7097,6 +7100,7 @@ if (v8_enable_i18n_support) {
@@ -7134,6 +7137,7 @@ if (v8_enable_i18n_support) {
outputs = [ output_file ]

args = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1 file changed, 5 insertions(+)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 38b8167..93c9bfc 100644
index f7ba313..ce7b6dd 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1819,6 +1819,11 @@ config("default_warnings") {
@@ -1818,6 +1818,11 @@ config("default_warnings") {
cflags += [
"-Wenum-compare-conditional",

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
2 files changed, 4 insertions(+)

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 3d538b3..a7f353b 100644
index c00c41b..7d32eb4 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1098,7 +1098,9 @@ component("base") {
@@ -1118,7 +1118,9 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 file changed, 18 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 93c9bfc..94e40fa 100644
index ce7b6dd..028ba52 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -616,24 +616,6 @@ config("compiler") {
@@ -618,24 +618,6 @@ config("compiler") {
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/autofill/core/browser/data_model/autofill_i18n_api.h b/components/autofill/core/browser/data_model/autofill_i18n_api.h
index fa577620509c8..f2bd0d075b846 100644
index fa57762..f2bd0d0 100644
--- a/components/autofill/core/browser/data_model/autofill_i18n_api.h
+++ b/components/autofill/core/browser/data_model/autofill_i18n_api.h
@@ -16,8 +16,8 @@ namespace autofill::i18n_model_definition {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
index d4de2e0..0dd4d3b 100644
index d3054d1..bdc13fb 100644
--- a/build/config/clang/BUILD.gn
+++ b/build/config/clang/BUILD.gn
@@ -128,14 +128,15 @@ template("clang_lib") {
@@ -121,14 +121,15 @@ template("clang_lib") {
} else if (is_apple) {
_dir = "darwin"
} else if (is_linux || is_chromeos) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
4 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/build/config/rust.gni b/build/config/rust.gni
index 814c455..c6b675d 100644
index e98d913..6213b72 100644
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -76,6 +76,11 @@ declare_args() {
@@ -87,6 +87,11 @@ declare_args() {
# a platform. Mostly applicable to Windows, where new versions can handle ANSI
# escape sequences but it's not reliable in general.
force_rustc_color_output = false
Expand All @@ -38,7 +38,7 @@ index 814c455..c6b675d 100644
}

# Use a separate declare_args so these variables' defaults can depend on the
@@ -185,12 +190,19 @@ if (enable_rust) {
@@ -196,12 +201,19 @@ if (enable_rust) {
# other toolchains.
rust_abi_target = ""
if (is_linux || is_chromeos) {
Expand All @@ -61,7 +61,7 @@ index 814c455..c6b675d 100644
} else if (current_cpu == "arm") {
if (arm_float_abi == "hard") {
float_suffix = "hf"
@@ -199,13 +211,13 @@ if (is_linux || is_chromeos) {
@@ -210,13 +222,13 @@ if (is_linux || is_chromeos) {
}
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
# No way to inform Rust about the -a suffix.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 file changed, 1 deletion(-)

diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
index 77f4b8c..3078de8 100644
index 8a25798..2d284e6 100644
--- a/build/rust/std/BUILD.gn
+++ b/build/rust/std/BUILD.gn
@@ -100,7 +100,6 @@ if (toolchain_has_rust) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 10 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 94e40fa..72088cf 100644
index 028ba52..f18ea0a 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1149,16 +1149,6 @@ config("compiler_cpu_abi") {
@@ -1155,16 +1155,6 @@ config("compiler_cpu_abi") {
"-msse3",
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index bd39797..2bc84d6 100644
index e342a39..1410489 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -120,7 +120,7 @@ if (enable_rust_boringssl) {
@@ -113,7 +113,7 @@ if (enable_rust_boringssl) {
}
}

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading