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
11 changes: 9 additions & 2 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ SRC_URI += " \
file://0021-Add-missing-typename-s.patch \
file://0027-Don-t-pass-disable-auto-upgrade-debug-info-to-linker.patch \
file://0028-Avoid-capturing-structured-bindings.patch \
file://0032-Backport-ozone-wayland-Fix-nullptr-deref-in-WaylandW.patch \
file://0033-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch \
file://0034-Avoid-parenthesized-initialization-of-aggregates.patch \
file://0035-Backport-IWYU-for-chromedriver-chrome-client_hints.h.patch \
file://0036-Avoid-std-ranges-find_if.patch \
file://0036-Backport-Remove-std-ranges-usage.patch \
file://0037-Fix-constexpr-variable-cannot-have-non-literal-type-.patch \
file://0038-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch \
file://0039-Fix-implicitly-deleted-default-constructor-build-err.patch \
file://0040-Backport-IWYU-for-ui-events-gesture_detection-motion.patch \
"
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://boringssl_no_asm_config.patch', d)}"

Expand Down Expand Up @@ -61,6 +62,12 @@ SRC_URI:append:arm = "\
file://0031-Fix-ARM-build-with-recent-glibc.patch \
"

# This fixes a build error with older versions of clang when V8 pointer
# compression is disabled, which is the case for 32-bit ARM.
SRC_URI:append:arm = "\
file://0041-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch \
"

ANY_OF_DISTRO_FEATURES = "opengl vulkan"

# Append instead of assigning; the gtk-icon-cache class inherited above also
Expand Down
42 changes: 13 additions & 29 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 @@ -17,10 +17,10 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index ae742b0..edf4dda 100644
index 46a1fce..6fc1c04 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -713,7 +713,7 @@ config("compiler") {
@@ -712,7 +712,7 @@ config("compiler") {

if (is_win) {
ldflags += [
Expand All @@ -29,7 +29,7 @@ index ae742b0..edf4dda 100644
"-mllvm:-import-instr-limit=$import_instr_limit",
"/lldltocache:" +
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
@@ -727,11 +727,11 @@ config("compiler") {
@@ -726,11 +726,11 @@ config("compiler") {
# usage in crbug.com/1038040. Note this will increase build time in
# Chrome OS.

Expand Down
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 edf4dda..06554be 100644
index 6fc1c04..3ebd975 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1109,11 +1109,6 @@ config("compiler_cpu_abi") {
@@ -1108,11 +1108,6 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
Expand All @@ -36,7 +36,7 @@ index edf4dda..06554be 100644
if (!is_nacl) {
cflags += [
"-march=$arm_arch",
@@ -1123,12 +1118,6 @@ config("compiler_cpu_abi") {
@@ -1122,12 +1117,6 @@ config("compiler_cpu_abi") {
if (arm_tune != "") {
cflags += [ "-mtune=$arm_tune" ]
}
Expand All @@ -49,7 +49,7 @@ index edf4dda..06554be 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1136,9 +1125,6 @@ config("compiler_cpu_abi") {
@@ -1135,9 +1124,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 edf4dda..06554be 100644
}
} else {
cflags += [ "-EL" ]
@@ -1218,8 +1204,6 @@ config("compiler_cpu_abi") {
@@ -1217,8 +1203,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -68,7 +68,7 @@ index edf4dda..06554be 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1267,9 +1251,6 @@ config("compiler_cpu_abi") {
@@ -1266,9 +1250,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 edf4dda..06554be 100644
}
} else {
cflags += [
@@ -1327,8 +1308,6 @@ config("compiler_cpu_abi") {
@@ -1326,8 +1307,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -87,7 +87,7 @@ index edf4dda..06554be 100644
} else {
cflags += [
"-EB",
@@ -1491,23 +1470,6 @@ config("compiler_deterministic") {
@@ -1490,23 +1469,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 c13cf05..e4b15cf 100644
index ca081a7..e21336e 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2083,6 +2083,7 @@ template("run_torque") {
@@ -2124,6 +2124,7 @@ template("run_torque") {
}

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
root_build_dir),
@@ -2215,6 +2216,7 @@ action("generate_bytecode_builtins_list") {
@@ -2269,6 +2270,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)",
@@ -2254,6 +2256,7 @@ template("run_mksnapshot") {
@@ -2308,6 +2310,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),
@@ -6695,6 +6698,7 @@ if (v8_enable_i18n_support) {
@@ -6852,6 +6855,7 @@ if (v8_enable_i18n_support) {
outputs = [ output_file ]

args = [
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 06554be..7300b23 100644
index 3ebd975..ebaa4fa 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1108,16 +1108,6 @@ config("compiler_cpu_abi") {
@@ -1107,16 +1107,6 @@ config("compiler_cpu_abi") {
"-msse3",
]
}
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 7300b23..5cfc021 100644
index ebaa4fa..1e9f4e7 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1706,6 +1706,11 @@ config("default_warnings") {
@@ -1711,6 +1711,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 304223b..c4a2965 100644
index 6e6f24e..764f133 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1150,7 +1150,9 @@ component("base") {
@@ -1112,7 +1112,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 @@ -24,18 +24,18 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 5cfc021..44b7150 100644
index 1e9f4e7..7c9a46e 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1399,7 +1399,6 @@ config("compiler_codegen") {
@@ -1398,7 +1398,6 @@ config("compiler_codegen") {
config("compiler_deterministic") {
cflags = []
ldflags = []
- swiftflags = []

# Eliminate build metadata (__DATE__, __TIME__ and __TIMESTAMP__) for
# deterministic build. See https://crbug.com/314403
@@ -1428,20 +1427,12 @@ config("compiler_deterministic") {
@@ -1427,20 +1426,12 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 44b7150..de0549d 100644
index 7c9a46e..52ad177 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -867,9 +867,11 @@ config("compiler") {
@@ -866,9 +866,11 @@ config("compiler") {
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
# lldb doesn't have the needed changes yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
index b64ab0c..fa25e2b 100644
index d2fde96..a64d6fc 100644
--- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
@@ -3722,15 +3722,15 @@ void WebMediaPlayerImpl::WriteSplitHistogram(
@@ -3732,15 +3732,15 @@ void WebMediaPlayerImpl::WriteSplitHistogram(
const T&... values) {
std::string strkey = std::string(key);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
7 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/components/password_manager/core/browser/affiliation/affiliation_fetcher_base.cc b/components/password_manager/core/browser/affiliation/affiliation_fetcher_base.cc
index 5d5b95e..3a49952 100644
index b23dbe1..f67da2e 100644
--- a/components/password_manager/core/browser/affiliation/affiliation_fetcher_base.cc
+++ b/components/password_manager/core/browser/affiliation/affiliation_fetcher_base.cc
@@ -179,7 +179,4 @@ void AffiliationFetcherBase::OnSimpleLoaderComplete(
@@ -185,7 +185,4 @@ void AffiliationFetcherBase::OnSimpleLoaderComplete(
}
}

Expand Down Expand Up @@ -61,22 +61,22 @@ index 5bf889f..946eabe 100644

AffiliationFetcherInterface() = default;
diff --git a/components/password_manager/core/browser/passkey_credential.cc b/components/password_manager/core/browser/passkey_credential.cc
index 09fe156..4dd0ddb 100644
index 1939e54..b3d57f0 100644
--- a/components/password_manager/core/browser/passkey_credential.cc
+++ b/components/password_manager/core/browser/passkey_credential.cc
@@ -103,7 +103,4 @@ int PasskeyCredential::GetAuthenticatorLabel() const {
}
@@ -96,7 +96,4 @@ std::u16string PasskeyCredential::GetAuthenticatorLabel() const {
return l10n_util::GetStringUTF16(id);
}

-bool operator==(const PasskeyCredential& lhs,
- const PasskeyCredential& rhs) = default;
-
} // namespace password_manager
diff --git a/components/password_manager/core/browser/passkey_credential.h b/components/password_manager/core/browser/passkey_credential.h
index 9553b16..5731c57 100644
index 42bf392..fcb53a7 100644
--- a/components/password_manager/core/browser/passkey_credential.h
+++ b/components/password_manager/core/browser/passkey_credential.h
@@ -66,8 +66,7 @@ class PasskeyCredential {
@@ -75,8 +75,7 @@ class PasskeyCredential {
const std::string& display_name() const { return display_name_; }

private:
Expand All @@ -86,8 +86,8 @@ index 9553b16..5731c57 100644

// Authenticator type this passkey belongs to.
Source source_;
@@ -93,8 +92,6 @@ class PasskeyCredential {
std::string display_name_;
@@ -106,8 +105,6 @@ class PasskeyCredential {
absl::optional<std::u16string> authenticator_label_;
};

-bool operator==(const PasskeyCredential& lhs, const PasskeyCredential& rhs);
Expand All @@ -96,10 +96,10 @@ index 9553b16..5731c57 100644

#endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSKEY_CREDENTIAL_H_
diff --git a/components/password_manager/core/browser/password_form.cc b/components/password_manager/core/browser/password_form.cc
index e11d520..c6c551a 100644
index d4976fa..6161547 100644
--- a/components/password_manager/core/browser/password_form.cc
+++ b/components/password_manager/core/browser/password_form.cc
@@ -230,8 +230,6 @@ AlternativeElement& AlternativeElement::operator=(AlternativeElement&& rhs) =
@@ -239,8 +239,6 @@ AlternativeElement& AlternativeElement::operator=(AlternativeElement&& rhs) =

AlternativeElement::~AlternativeElement() = default;

Expand All @@ -109,7 +109,7 @@ index e11d520..c6c551a 100644
return std::tie(value, field_renderer_id, name) <
std::tie(other.value, other.field_renderer_id, other.name);
diff --git a/components/password_manager/core/browser/password_form.h b/components/password_manager/core/browser/password_form.h
index a737d53..7450bef 100644
index cdda601..3b58eaf 100644
--- a/components/password_manager/core/browser/password_form.h
+++ b/components/password_manager/core/browser/password_form.h
@@ -44,7 +44,7 @@ struct AlternativeElement {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h b/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
index 77ec1fe..9375048 100644
index 8a8095c..188430e 100644
--- a/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
+++ b/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
@@ -25,7 +25,7 @@
Expand Down
Loading