Skip to content

chromium: Update to 136.0.7103.113 #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
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
28 changes: 23 additions & 5 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,24 @@ SRC_URI += "\
file://0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
file://0009-Adjust-the-Rust-build-to-our-needs.patch \
file://0010-Don-t-require-profiler_builtins.rlib.patch \
file://0011-Disable-crabbyavif-to-fix-build-errors.patch \
file://0012-Revert-Allow-and-use-std-hardware_destructive_interf.patch \
file://0013-Revert-Set-Rust-symbol-visibility-to-hidden-when-C-s.patch \
file://0014-pdfium-Fix-missing-PDFiumAPIStringBufferAdapter-temp.patch \
file://0015-Revert-Connect-the-Rust-log-crate-to-the-base-loggin.patch \
file://0011-Revert-Allow-and-use-std-hardware_destructive_interf.patch \
file://0012-Revert-Set-Rust-symbol-visibility-to-hidden-when-C-s.patch \
file://0013-pdfium-Fix-missing-PDFiumAPIStringBufferAdapter-temp.patch \
file://0014-Revert-Remove-libavif-based-AVIF-decoder.patch \
file://0015-Revert-Remove-third_party-libavif.patch \
file://0016-Disable-crabbyavif-to-fix-build-errors.patch \
file://0017-rust-Use-adler-instead-of-adler2.patch \
file://0018-third_party-node-update_node_binaries-Update-nodejs-.patch \
"

# Missing third_party sources.
SRC_URI += "\
git://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif;protocol=https;branch=main;name=libavif;destsuffix=third_party/libavif/src \
"

SRCREV_FORMAT .= "_libavif"
SRCREV_libavif = "e7b34a1f5e9f7024d08311c7bae156061b889882"

# ARM/AArch64-specific patches.
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"

Expand Down Expand Up @@ -475,6 +487,12 @@ do_copy_target_rustlibs () {
}
addtask copy_target_rustlibs after do_configure before do_compile

do_copy_missing_third_party_sources () {
rm -rf ${S}/third_party/libavif/src
cp -r ${UNPACKDIR}/third_party/libavif/src/ ${S}/third_party/libavif/
}
addtask copy_missing_third_party_sources after do_patch before do_configure

do_configure() {
cd ${S}
python3 ./build/linux/unbundle/replace_gn_files.py --system-libraries ${GN_UNBUNDLE_LIBS}
Expand Down
286 changes: 219 additions & 67 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
@@ -1,4 +1,4 @@
From 2e867ac9e97b5ae2090b4de212d9c0e50eee653b Mon Sep 17 00:00:00 2001
From feb3b8299f312e4074fc76fe7b6dfa236a5823d8 Mon Sep 17 00:00:00 2001
From: Max Ihlenfeldt <[email protected]>
Date: Tue, 25 Jun 2024 11:06:19 +0000
Subject: [PATCH] Drop GN compiler settings conflicting with OE
Expand All @@ -19,10 +19,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1 file changed, 46 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index f58320b88f..309c3078a2 100644
index e7a60d56b5..b0e9e04bf3 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1240,26 +1240,6 @@ config("compiler_cpu_abi") {
@@ -1211,26 +1211,6 @@ config("compiler_cpu_abi") {
"-msse3",
]
}
Expand All @@ -49,7 +49,7 @@ index f58320b88f..309c3078a2 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1267,9 +1247,6 @@ config("compiler_cpu_abi") {
@@ -1238,9 +1218,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 f58320b88f..309c3078a2 100644
}
} else {
cflags += [ "-EL" ]
@@ -1349,8 +1326,6 @@ config("compiler_cpu_abi") {
@@ -1320,8 +1297,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -68,7 +68,7 @@ index f58320b88f..309c3078a2 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1399,8 +1374,6 @@ config("compiler_cpu_abi") {
@@ -1370,8 +1345,6 @@ config("compiler_cpu_abi") {
cflags += [ "--target=mips64el-linux-android" ]
ldflags += [ "--target=mips64el-linux-android" ]
} else {
Expand All @@ -77,7 +77,7 @@ index f58320b88f..309c3078a2 100644
}
} else {
cflags += [
@@ -1458,8 +1431,6 @@ config("compiler_cpu_abi") {
@@ -1429,8 +1402,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -86,7 +86,7 @@ index f58320b88f..309c3078a2 100644
} else {
cflags += [
"-EB",
@@ -1628,23 +1599,6 @@ config("compiler_deterministic") {
@@ -1599,23 +1570,6 @@ config("compiler_deterministic") {
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 60233d0570b4c9c9a9827616b224c9c93cbf6254 Mon Sep 17 00:00:00 2001
From d326bbe195c6853c600d01b9d438b5ee430b55c2 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <[email protected]>
Date: Tue, 7 Nov 2017 15:24:32 +0100
Subject: [PATCH] v8: qemu wrapper
Expand All @@ -17,46 +17,46 @@ Signed-off-by: Maksim Sisov <[email protected]>
2 files changed, 5 insertions(+)

diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
index f46bec2eb5..54383655c0 100644
index 70c32b2fc9..88497d1436 100644
--- a/tools/v8_context_snapshot/BUILD.gn
+++ b/tools/v8_context_snapshot/BUILD.gn
@@ -45,6 +45,7 @@ if (use_v8_context_snapshot) {
output_path = rebase_path(output_file, root_build_dir)
@@ -49,6 +49,7 @@ if (use_v8_context_snapshot) {
output_path = rebase_path(output_file, root_build_dir)

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(get_label_info(":v8_context_snapshot_generator",
"root_out_dir") +
"/v8_context_snapshot_generator",
args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(
":v8_context_snapshot_generator($v8_snapshot_toolchain)",
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
index 0c559713ea..c8c95eb3a9 100644
index 9a2b2cdd94..8c217b57c9 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2274,6 +2274,7 @@ template("run_torque") {
@@ -2228,6 +2228,7 @@ template("run_torque") {
}

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
root_build_dir),
@@ -2437,6 +2438,7 @@ action("generate_bytecode_builtins_list") {
@@ -2391,6 +2392,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)",
@@ -2509,6 +2511,7 @@ template("run_mksnapshot") {
@@ -2470,6 +2472,7 @@ template("run_mksnapshot") {
}

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

args = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 71eca88e5d42d4732dfe53ea8fadf2199db519a2 Mon Sep 17 00:00:00 2001
From a8c669d57bd409ba07255bd52fe3c9f0817de2ac Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <[email protected]>
Date: Wed, 8 Nov 2017 16:43:47 +0100
Subject: [PATCH] wrapper: extra flags
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fc3a1af7d8d6ed6bc54d096e72cbf3d35ff4fa97 Mon Sep 17 00:00:00 2001
From 0a052a88bf96542e0bb7585ccbfd39e681a32e3d Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
Date: Wed, 4 Dec 2019 19:06:54 -0800
Subject: [PATCH] Delete compiler options not available in release versions of
Expand All @@ -17,29 +17,28 @@ Signed-off-by: Randy MacLeod <[email protected]>
Signed-off-by: Ariel D'Alessandro <[email protected]>

---
build/config/compiler/BUILD.gn | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
build/config/compiler/BUILD.gn | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 309c3078a2647..5eeb241fc9038 100644
index b0e9e04bf3..46ed84d73c 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -615,14 +615,6 @@ config("compiler") {
@@ -614,13 +614,6 @@ config("compiler") {
} else {
cflags += [ "-ffp-contract=off" ]
}
-
- # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF
- # (excluding toolchains that use an older version of LLVM).
- # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
- if (is_linux && !llvm_android_mainline && current_cpu != "arm" &&
- if (is_linux && !llvm_android_mainline &&
- default_toolchain != "//build/toolchain/cros:target") {
- cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
- }
}

# C11/C++11 compiler flags setup.
@@ -1924,6 +1916,11 @@ config("default_warnings") {
@@ -1934,6 +1927,11 @@ config("default_warnings") {
}

cflags += [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c68f4f68490005e1576ca2339b1124dca5f83867 Mon Sep 17 00:00:00 2001
From be9a610454f3a90e2610443a424efcb34b4903e5 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <[email protected]>
Date: Fri, 22 Jan 2021 00:02:25 +0800
Subject: [PATCH] avoid link latomic failure on CentOS 8 host
Expand All @@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
2 files changed, 4 insertions(+)

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 5dee8a9226..bc3e57164a 100644
index 57a6af0061..2703e81421 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1077,7 +1077,9 @@ component("base") {
@@ -1104,7 +1104,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
@@ -1,4 +1,4 @@
From 651736ea42939ae67169d3429489ae9f304eae3c Mon Sep 17 00:00:00 2001
From 8e9bf93215630604eed49476d6e848ad3ec3bdba Mon Sep 17 00:00:00 2001
From: Max Ihlenfeldt <[email protected]>
Date: Fri, 8 Dec 2023 11:47:43 +0000
Subject: [PATCH] Don't pass unknown LLVM options
Expand All @@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1 file changed, 18 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 8951f6006c..cc300e7122 100644
index 46ed84d73c..5f7cfb69e9 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -591,24 +591,6 @@ config("compiler") {
@@ -590,24 +590,6 @@ config("compiler") {
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5a28cb783a33391476839a5b904f0eab7fb9b13d Mon Sep 17 00:00:00 2001
From 713169dbbcb3081744ea103749597885bb1b97a2 Mon Sep 17 00:00:00 2001
From: Max Ihlenfeldt <[email protected]>
Date: Fri, 22 Mar 2024 10:43:47 +0000
Subject: [PATCH] Fix "constexpr variable must be initialized by a constant
Expand All @@ -10,13 +10,13 @@ change the problematic expressions to be const instead.
Upstream-Status: Inappropriate [specific to older versions of clang]
Signed-off-by: Max Ihlenfeldt <[email protected]>
---
.../autofill/core/browser/data_model/autofill_i18n_api.h | 4 ++--
.../core/browser/data_model/addresses/autofill_i18n_api.h | 4 ++--
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 fa1a06bdad..8e1fe01bfc 100644
--- a/components/autofill/core/browser/data_model/autofill_i18n_api.h
+++ b/components/autofill/core/browser/data_model/autofill_i18n_api.h
diff --git a/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.h b/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.h
index e926bdca5b..799c4b3f80 100644
--- a/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.h
+++ b/components/autofill/core/browser/data_model/addresses/autofill_i18n_api.h
@@ -16,8 +16,8 @@ namespace autofill::i18n_model_definition {
// Country code that represents autofill's legacy address hierarchy model as
// stored `kAutofillModelRules`. As a workaround for GCC we declare the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b9b4dffd99fd57dc3acbce7304284c26a10e695e Mon Sep 17 00:00:00 2001
From 6fcf4a20eef34ad3577505b8c36cd2ecd5e97676 Mon Sep 17 00:00:00 2001
From: Max Ihlenfeldt <[email protected]>
Date: Tue, 19 Dec 2023 12:14:05 +0000
Subject: [PATCH] Use the correct path to libclang_rt.builtins.a
Expand All @@ -21,12 +21,12 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
index 44bd202d2b..6789beccdc 100644
index 0d648fa310..4652cb5127 100644
--- a/build/config/clang/BUILD.gn
+++ b/build/config/clang/BUILD.gn
@@ -166,14 +166,15 @@ template("clang_lib") {
} else if (is_apple) {
_dir = "darwin"
@@ -199,14 +199,15 @@ template("clang_lib") {
assert(false) # Unhandled cpu type
}
} else if (is_linux || is_chromeos) {
+ _dir = "linux"
if (current_cpu == "x64") {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f4f50a5de596d13d18f1f9b80f83e446936a4afb Mon Sep 17 00:00:00 2001
From 394ff496602bf9695c7f815f5f73c0027ab4ddc7 Mon Sep 17 00:00:00 2001
From: Max Ihlenfeldt <[email protected]>
Date: Tue, 16 Jan 2024 12:29:30 +0000
Subject: [PATCH] Adjust the Rust build to our needs
Expand All @@ -16,14 +16,14 @@ Subject: [PATCH] Adjust the Rust build to our needs
Upstream-Status: Inappropriate [specific to our build setup]
Signed-off-by: Max Ihlenfeldt <[email protected]>
---
build/config/rust.gni | 26 +++++++++++++++++++-------
build/config/rust.gni | 28 ++++++++++++++++++++--------
build/rust/rustc_wrapper.py | 1 +
build/rust/std/BUILD.gn | 28 +++++++++++++++++++++-------
build/rust/std/find_std_rlibs.py | 16 +++++++++++-----
4 files changed, 52 insertions(+), 19 deletions(-)
4 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/build/config/rust.gni b/build/config/rust.gni
index 60856e609d..4baeaecb9c 100644
index 74b3b9ced5..5affd0b445 100644
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -102,6 +102,11 @@ declare_args() {
Expand Down Expand Up @@ -63,12 +63,16 @@ index 60856e609d..4baeaecb9c 100644
cargo_target_abi = ""
} else if (current_cpu == "arm") {
if (arm_float_abi == "hard") {
@@ -191,18 +203,18 @@ if (is_linux || is_chromeos) {
}
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
# No way to inform Rust about the -a suffix.
- rust_abi_target = "armv7-unknown-linux-gnueabi" + float_suffix
+ rust_abi_target = "armv7" + vendor + "-linux-gnueabi" + float_suffix
@@ -201,21 +213,21 @@ if (is_linux || is_chromeos) {
# targets in fact target Thumb, see:
# https://github.com/rust-lang/rust/issues/44722
if (arm_use_neon) {
- rust_abi_target = "thumbv7neon-unknown-linux-gnueabi" + float_suffix
+ rust_abi_target = "thumbv7neon" + vendor + "-linux-gnueabi" + float_suffix
} else {
- rust_abi_target = "armv7-unknown-linux-gnueabi" + float_suffix
+ rust_abi_target = "armv7" + vendor + "-linux-gnueabi" + float_suffix
}
cargo_target_abi = "eabi" + float_suffix
} else {
- rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix
Expand Down Expand Up @@ -99,10 +103,10 @@ index 8f2096dfe5..de43d44eed 100755
abs_build_root = os.getcwd().replace('\\', '/') + '/'
is_windows = sys.platform == 'win32' or args.target_windows
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
index b5f5291283..9619dccc45 100644
index 6b996aa1fe..146f6633ce 100644
--- a/build/rust/std/BUILD.gn
+++ b/build/rust/std/BUILD.gn
@@ -191,7 +191,8 @@ if (toolchain_has_rust) {
@@ -207,7 +207,8 @@ if (toolchain_has_rust) {
# our locally-built std. Both reside in root_out_dir: we must only have one of
# each per GN toolchain anyway.

Expand All @@ -112,7 +116,7 @@ index b5f5291283..9619dccc45 100644

if (!rust_prebuilt_stdlib) {
local_rustc_sysroot = "$root_out_dir/local_rustc_sysroot"
@@ -320,12 +321,12 @@ if (toolchain_has_rust) {
@@ -336,12 +337,12 @@ if (toolchain_has_rust) {
rust_abi_target,
]

Expand All @@ -128,7 +132,7 @@ index b5f5291283..9619dccc45 100644
}

visibility = [ ":*" ]
@@ -338,8 +339,18 @@ if (toolchain_has_rust) {
@@ -354,8 +355,18 @@ if (toolchain_has_rust) {
"enable_rust=false")
deps = [ ":find_stdlib" ]
sources = get_target_outputs(":find_stdlib")
Expand All @@ -149,7 +153,7 @@ index b5f5291283..9619dccc45 100644

visibility = [ ":*" ]
}
@@ -379,7 +390,10 @@ if (toolchain_has_rust) {
@@ -395,7 +406,10 @@ if (toolchain_has_rust) {
":prebuilt_stdlib_libs",
":stdlib_public_dependent_libs",
]
Expand Down
Loading