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
6 changes: 5 additions & 1 deletion meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ B = "${S}/${OUTPUT_DIR}"

# Backported patches.
SRC_URI += "\
file://backport/IWYU-for-chromedriver-chrome-client_hints.h.patch \
file://backport/IWYU-for-ui-events-gesture_detection-motion.patch \
file://backport/Remove-std-ranges-usage.patch \
file://backport/lacros-Include-string_view-from-net-cert-pk.patch \
file://backport/IWYU-Add-includes-for-size_t-and-int64_t-us.patch \
file://backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch \
file://backport/Initialize-ServerCvc-with-designated-initia.patch \
file://backport/IWYU-for-net-filter-zstd_source_stream.cc.patch \
"
# Non-specific patches.
SRC_URI += "\
Expand Down
6 changes: 5 additions & 1 deletion meta-chromium/recipes-browser/chromium/chromium.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
CVE_PRODUCT = "chromium:chromium google:chrome"

SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
SRC_URI[sha256sum] = "28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead"
SRC_URI[sha256sum] = "7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786"

S = "${WORKDIR}/chromium-${PV}"

Expand Down Expand Up @@ -79,6 +79,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \
file://${S}/courgette/third_party/bsdiff/LICENCE;md5=7c2ad392281bc3d9b04a31102ee7abdd \
file://${S}/courgette/third_party/divsufsort/LICENSE;md5=e261f081e52882dad3ff0225497ce451 \
file://${S}/ios/components/third_party/compiler-rt/LICENSE.TXT;md5=67ce57844c93575886f0099fa1bf95cd \
file://${S}/ios/third_party/blink/LICENSE;md5=9fdb47308c4e0a2b6d07c5af39e5da1a \
file://${S}/ios/third_party/lottie/LICENSE;md5=1e714768add1e7fdb1288bac703bad06 \
file://${S}/ios/third_party/material_components_ios/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down Expand Up @@ -265,6 +266,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/fontconfig/src/COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \
file://${S}/third_party/fp16/LICENSE;md5=855dd24c28c76c916c5c2301b1958728 \
file://${S}/third_party/freetype/src/docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
file://${S}/third_party/fuchsia-gn-sdk/LICENSE;md5=4c8b7c5e9d0a48795db3dcd70f738ea5 \
file://${S}/third_party/fusejs/LICENSE;md5=f61de6d0d3d200550e44d63cc2a4fb67 \
file://${S}/third_party/fxdiv/src/LICENSE;md5=0c2eed7ba400a6fea8fec2a582b177e8 \
file://${S}/third_party/gemmlowp/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down Expand Up @@ -314,6 +316,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/libunwind/src/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
file://${S}/third_party/liburlpattern/LICENSE;md5=5be7cac9f8920c488c4dda56dbfeaec2 \
file://${S}/third_party/libusb/src/COPYING;md5=fbc093901857fcd118f065f900982c24 \
file://${S}/third_party/libva_protected_content/LICENSE;md5=2e48940f94acb0af582e5ef03537800f \
file://${S}/third_party/libvpx/source/libvpx/LICENSE;md5=d5b04755015be901744a78cc30d390d4 \
file://${S}/third_party/libwebm/source/LICENSE.TXT;md5=6e8dee932c26f2dab503abf70c96d8bb \
file://${S}/third_party/libwebp/LICENSE;md5=72dceabd78c6f435bb304047aff1745a \
Expand Down Expand Up @@ -380,6 +383,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/tflite_support/LICENSE;md5=e03a906d141508f60cbe30013b8d064b \
file://${S}/third_party/ukey2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/unrar/src/license.txt;md5=fc9c335ec05a5f36764ef9ce7a79daa1 \
file://${S}/third_party/updater/LICENSE;md5=cae49083c47e95af08185adc3852b104 \
file://${S}/third_party/usb_ids/LICENSE;md5=8f694e3758e3e57a5223bfa2bf29d452 \
file://${S}/third_party/utf/LICENSE;md5=b940b7cb006a9c3a53ac180bdbe41473 \
file://${S}/third_party/v4l-utils/COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0 \
Expand Down
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 46a1fce..6fc1c04 100644
index 06812fb..2a810d9 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -712,7 +712,7 @@ config("compiler") {
@@ -721,7 +721,7 @@ config("compiler") {

if (is_win) {
ldflags += [
Expand All @@ -29,7 +29,7 @@ index 46a1fce..6fc1c04 100644
"-mllvm:-import-instr-limit=$import_instr_limit",
"/lldltocache:" +
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
@@ -726,11 +726,11 @@ config("compiler") {
@@ -735,11 +735,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 6fc1c04..3ebd975 100644
index 2a810d9..f991efd 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1108,11 +1108,6 @@ config("compiler_cpu_abi") {
@@ -1112,11 +1112,6 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
Expand All @@ -36,7 +36,7 @@ index 6fc1c04..3ebd975 100644
if (!is_nacl) {
cflags += [
"-march=$arm_arch",
@@ -1122,12 +1117,6 @@ config("compiler_cpu_abi") {
@@ -1126,12 +1121,6 @@ config("compiler_cpu_abi") {
if (arm_tune != "") {
cflags += [ "-mtune=$arm_tune" ]
}
Expand All @@ -49,7 +49,7 @@ index 6fc1c04..3ebd975 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1135,9 +1124,6 @@ config("compiler_cpu_abi") {
@@ -1139,9 +1128,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 6fc1c04..3ebd975 100644
}
} else {
cflags += [ "-EL" ]
@@ -1217,8 +1203,6 @@ config("compiler_cpu_abi") {
@@ -1221,8 +1207,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -68,7 +68,7 @@ index 6fc1c04..3ebd975 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1266,9 +1250,6 @@ config("compiler_cpu_abi") {
@@ -1270,9 +1254,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 6fc1c04..3ebd975 100644
}
} else {
cflags += [
@@ -1326,8 +1307,6 @@ config("compiler_cpu_abi") {
@@ -1330,8 +1311,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -87,7 +87,7 @@ index 6fc1c04..3ebd975 100644
} else {
cflags += [
"-EB",
@@ -1490,23 +1469,6 @@ config("compiler_deterministic") {
@@ -1494,23 +1473,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 ca081a7..e21336e 100644
index dd97c4f..c3961b0 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2124,6 +2124,7 @@ template("run_torque") {
@@ -2137,6 +2137,7 @@ template("run_torque") {
}

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
root_build_dir),
@@ -2269,6 +2270,7 @@ action("generate_bytecode_builtins_list") {
@@ -2294,6 +2295,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)",
@@ -2308,6 +2310,7 @@ template("run_mksnapshot") {
@@ -2333,6 +2335,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),
@@ -6852,6 +6855,7 @@ if (v8_enable_i18n_support) {
@@ -6882,6 +6885,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 ebaa4fa..1e9f4e7 100644
index f991efd..0b69949 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1711,6 +1711,11 @@ config("default_warnings") {
@@ -1735,6 +1735,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 6e6f24e..764f133 100644
index 82cb596..5eb1a6d 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1112,7 +1112,9 @@ component("base") {
@@ -1111,7 +1111,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 1e9f4e7..7c9a46e 100644
index 0b69949..00fa15a 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1398,7 +1398,6 @@ config("compiler_codegen") {
@@ -1412,7 +1412,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
@@ -1427,20 +1426,12 @@ config("compiler_deterministic") {
@@ -1441,20 +1440,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 @@ -7,25 +7,22 @@ Upstream-Status: Inappropriate clang-12 only.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>

---
build/config/compiler/BUILD.gn | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
build/config/compiler/BUILD.gn | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 7c9a46e..52ad177 100644
index 06812fb..bc29b94 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -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.
- if (is_clang && !is_nacl && !is_win && !is_apple) {
- cflags_cc += [ "-gsimple-template-names" ]
- }
+ # Drop for 109 due to dunfell:
+ # clang-12: error: unknown argument: '-gsimple-template-names'
+ #if (is_clang && !is_nacl && !is_win && !is_apple) {
+ # cflags_cc += [ "-gsimple-template-names" ]
+ #}
@@ -192,7 +192,10 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of
# debugging information which is required by some specialized
# debugging tools.
- simple_template_names = is_clang && !is_nacl && !is_win && !is_apple
+ #
+ # Disabled because the version of clang used on dunfell doesn't recognize the
+ # argument.
+ simple_template_names = false
}

# MLGO specific flags. These flags enable an ML-based inliner trained on
# Chrome on Android (arm32) with ThinLTO enabled, optimizing for size.
declare_args() {
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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 d2fde96..a64d6fc 100644
index d752a7b..3f05a1b 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
@@ -3732,15 +3732,15 @@ void WebMediaPlayerImpl::WriteSplitHistogram(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ 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 1939e54..b3d57f0 100644
index 9c79b70..2a88233 100644
--- a/components/password_manager/core/browser/passkey_credential.cc
+++ b/components/password_manager/core/browser/passkey_credential.cc
@@ -96,7 +96,4 @@ std::u16string PasskeyCredential::GetAuthenticatorLabel() const {
@@ -99,7 +99,4 @@ std::u16string PasskeyCredential::GetAuthenticatorLabel() const {
return l10n_util::GetStringUTF16(id);
}

Expand All @@ -73,10 +73,10 @@ index 1939e54..b3d57f0 100644
-
} // namespace password_manager
diff --git a/components/password_manager/core/browser/passkey_credential.h b/components/password_manager/core/browser/passkey_credential.h
index 42bf392..fcb53a7 100644
index 6549ca5..faa9da9 100644
--- a/components/password_manager/core/browser/passkey_credential.h
+++ b/components/password_manager/core/browser/passkey_credential.h
@@ -75,8 +75,7 @@ class PasskeyCredential {
@@ -76,8 +76,7 @@ class PasskeyCredential {
const std::string& display_name() const { return display_name_; }

private:
Expand All @@ -86,7 +86,7 @@ index 42bf392..fcb53a7 100644

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

Expand All @@ -96,10 +96,10 @@ index 42bf392..fcb53a7 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 d4976fa..6161547 100644
index 3dac412..f60b23f 100644
--- a/components/password_manager/core/browser/password_form.cc
+++ b/components/password_manager/core/browser/password_form.cc
@@ -239,8 +239,6 @@ AlternativeElement& AlternativeElement::operator=(AlternativeElement&& rhs) =
@@ -242,8 +242,6 @@ AlternativeElement& AlternativeElement::operator=(AlternativeElement&& rhs) =

AlternativeElement::~AlternativeElement() = default;

Expand All @@ -109,10 +109,10 @@ index d4976fa..6161547 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 cdda601..3b58eaf 100644
index a27301f..c2597aa 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 {
@@ -45,7 +45,7 @@ struct AlternativeElement {
AlternativeElement& operator=(AlternativeElement&& rhs);
~AlternativeElement();

Expand Down
Loading