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
10 changes: 8 additions & 2 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ SRC_URI += " \
file://0005-BUILD-do-not-specify-march-on-arm.patch \
file://0007-Delete-compiler-options-not-available-in-release-ver.patch \
file://0008-avoid-link-latomic-failure-on-CentOS-8-host.patch \
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
file://0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
file://0013-Fix-html_minifier-script-for-node-v12.patch \
file://0015-drop-gsimple-template-names.patch \
file://0016-cast-to-bool-to-avoid-constexpr-error.patch \
file://0017-Revert-Fix-std-span-autodetection-7805.patch \
file://0018-Only-default-operator-on-declaration.patch \
file://0019-Backport-constexpr-std-string-fixes.patch \
file://0020-Revert-__attribute__-and-alignas-changes.patch \
file://0021-Add-missing-typename-s.patch \
file://0022-Backport-Avoid-capturing-structured-bindings.patch \
file://0023-Backport-IWYU-for-translate-TranslateUILanguagesMana.patch \
file://0024-Backport-Fix-erroneous-SupportsOstreamOperator-int-i.patch \
file://0025-Backport-Do-not-use-std-monospace-for-absl-variant.patch \
file://0026-Backport-std-string-ends_with-is-C-20.-Use-base-Ends.patch \
"

SRC_URI:append:libc-musl = "\
Expand Down
8 changes: 5 additions & 3 deletions 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] = "168c62fea9f428f99fbf967f36a75ee5da160429e3a5b86bf02188c5fe7c79fd"
SRC_URI[sha256sum] = "0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93"

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

Expand Down Expand Up @@ -72,6 +72,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/buildtools/third_party/libc++/trunk/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
file://${S}/buildtools/third_party/libc++abi/trunk/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
file://${S}/buildtools/third_party/libunwind/trunk/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
file://${S}/chrome/browser/resources/chromeos/accessibility/chromevox/third_party/tamachiyomi/LICENSE;md5=15772cfcf7016e701ce54554516c0688 \
file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \
file://${S}/chrome/installer/mac/third_party/xz/LICENSE;md5=8bbde65ae0523dc878ed1ac1252d2d14 \
file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \
Expand Down Expand Up @@ -200,7 +201,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_rust_toolchain/toolchain/share/doc/rust/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \
file://${S}/third_party/android_sdk/LICENSE;md5=a9559ed17808a8b10eec6672f993ce75 \
file://${S}/third_party/android_swipe_refresh/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_system_sdk/LICENSE;md5=cbb64e76df0f98fc138b1918c089417e \
Expand Down Expand Up @@ -230,6 +230,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/cpuinfo/src/LICENSE;md5=cabca80e8e4a4bbe90e9a4b4ad53f5f4 \
file://${S}/third_party/crashpad/crashpad/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/crc32c/src/LICENSE;md5=e9ed01b5e5ac9eae23fc2bb33701220c \
file://${S}/third_party/cros-components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/crubit/LICENSE;md5=e8237eb3ff53402dada6d65b7640b60b \
file://${S}/third_party/d3/src/LICENSE;md5=0679931d76eb2f1dd1915249da84a722 \
file://${S}/third_party/dav1d/LICENSE;md5=59cb7015cbeea4a8675b9bdb657d41b3 \
Expand Down Expand Up @@ -295,11 +296,12 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/libaom/source/libaom/LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \
file://${S}/third_party/libavif/LICENSE;md5=15744a27d810133340dc64ad411ec4cd \
file://${S}/third_party/libbrlapi/LICENSE;md5=fad9b3332be894bab9bc501572864b29 \
file://${S}/third_party/libei/LICENSE;md5=a98fa76460f96f41696611d6f07e8d49 \
file://${S}/third_party/libevent/LICENSE;md5=a2b0302a710150293fb85d2bfabd3de6 \
file://${S}/third_party/libgav1/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/libipp/LICENSE;md5=af9e58383a1b2b17c75c6c9ff561ca9d \
file://${S}/third_party/libjingle_xmpp/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=a75feaa2de6d8942f50d412241fca1f1 \
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155 \
file://${S}/third_party/liblouis/LICENSE;md5=8ab69863de0d3a0e00c4f97a4d78dd4a \
file://${S}/third_party/libphonenumber/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
file://${S}/third_party/libpng/LICENSE;md5=b0085051bf265bac2bfc38bc89f50000 \
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 9afb4425840b9..6c38d4fa27855 100644
index d3adf9735ca95..bbe807fdc7b04 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -685,7 +685,7 @@ config("compiler") {
@@ -680,7 +680,7 @@ config("compiler") {

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

Expand All @@ -44,8 +44,8 @@ index 9afb4425840b9..6c38d4fa27855 100644
+ ldflags += [ "-Wl,--thinlto-jobs=" + max_jobs_per_link ]
+
if (is_apple) {
_object_path_suffix = ""
if (is_ios) {
ldflags += [
"-Wl,-cache_path_lto," +
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
index 4738ee80d307c..7a43b1113a495 100644
--- a/build/config/compiler/compiler.gni
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 6c38d4fa27855..7bae0340ede9a 100644
index bbe807fdc7b04..ca70a35b4d269 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1009,11 +1009,6 @@ config("compiler_cpu_abi") {
@@ -996,11 +996,6 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
Expand All @@ -36,7 +36,7 @@ index 6c38d4fa27855..7bae0340ede9a 100644
if (!is_nacl) {
cflags += [
"-march=$arm_arch",
@@ -1023,12 +1018,6 @@ config("compiler_cpu_abi") {
@@ -1010,12 +1005,6 @@ config("compiler_cpu_abi") {
if (arm_tune != "") {
cflags += [ "-mtune=$arm_tune" ]
}
Expand All @@ -49,7 +49,7 @@ index 6c38d4fa27855..7bae0340ede9a 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1036,9 +1025,6 @@ config("compiler_cpu_abi") {
@@ -1023,9 +1012,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 6c38d4fa27855..7bae0340ede9a 100644
}
} else {
cflags += [ "-EL" ]
@@ -1118,8 +1104,6 @@ config("compiler_cpu_abi") {
@@ -1105,8 +1091,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -68,7 +68,7 @@ index 6c38d4fa27855..7bae0340ede9a 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1167,9 +1151,6 @@ config("compiler_cpu_abi") {
@@ -1154,9 +1138,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 6c38d4fa27855..7bae0340ede9a 100644
}
} else {
cflags += [
@@ -1227,8 +1208,6 @@ config("compiler_cpu_abi") {
@@ -1214,8 +1195,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -87,7 +87,7 @@ index 6c38d4fa27855..7bae0340ede9a 100644
} else {
cflags += [
"-EB",
@@ -1391,23 +1370,6 @@ config("compiler_deterministic") {
@@ -1378,23 +1357,6 @@ config("compiler_deterministic") {
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@ index 52504f4f6f009..40425d63454f3 100644
"root_out_dir") +
"/v8_context_snapshot_generator",
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
index 277f47717da..acdb09bf9ae 100644
index 8f937794079..3f4071e0c88 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2007,6 +2007,7 @@ template("run_torque") {
@@ -2012,6 +2012,7 @@ template("run_torque") {
}

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
root_build_dir),
@@ -2139,6 +2140,7 @@ action("generate_bytecode_builtins_list") {
@@ -2144,6 +2145,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)",
@@ -2178,6 +2180,7 @@ template("run_mksnapshot") {
@@ -2183,6 +2185,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),
@@ -6484,6 +6487,7 @@ if (v8_enable_i18n_support) {
@@ -6546,6 +6549,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 7bae0340ede9a..480f4d07a6e67 100644
index ca70a35b4d269..a789a5aa0178c 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1008,16 +1008,6 @@ config("compiler_cpu_abi") {
@@ -995,16 +995,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 480f4d07a6e67..a0b5ad19e40ab 100644
index a789a5aa0178c..fe0f989625879 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1596,6 +1596,11 @@ config("default_warnings") {
@@ -1583,6 +1583,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 422702cb196c5..59e1773326041 100644
index 4d8087f0d747e..a3d75f04f6aff 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1093,7 +1093,9 @@ component("base") {
@@ -1105,7 +1105,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
Comment thread
MaxIhlenfeldt marked this conversation as resolved.

This file was deleted.

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 a0b5ad19e40ab..ff2f5f4fcd482 100644
index fe0f989625879..1259819238f17 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1299,7 +1299,6 @@ config("compiler_codegen") {
@@ -1286,7 +1286,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
@@ -1328,20 +1327,12 @@ config("compiler_deterministic") {
@@ -1315,20 +1314,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

This file was deleted.

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 ff2f5f4fcd482..2f99c80f51371 100644
index 1259819238f17..4ae9a6e9e4df1 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -826,9 +826,11 @@ config("compiler") {
@@ -816,9 +816,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 1a82667678a16..6e9740f54876b 100644
index e5e4b31d6b329..efabbb31d67af 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
@@ -3699,15 +3699,15 @@ void WebMediaPlayerImpl::WriteSplitHistogram(
@@ -3734,15 +3734,15 @@ void WebMediaPlayerImpl::WriteSplitHistogram(
const T&... values) {
std::string strkey = std::string(key);

Expand Down
Loading