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 @@ -11,7 +11,9 @@ OUTPUT_DIR = "out/Release"
B = "${S}/${OUTPUT_DIR}"

# Backported patches.
# (none, currently \o/)
SRC_URI += "\
file://backport/Backport-chrome-browser-ui-views-side_panel-fix-miss.patch \
"

# Non-specific patches.
SRC_URI += "\
Expand All @@ -25,6 +27,8 @@ 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-m127-side_panel-Add-missing-deps.patch \
"
# 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
21 changes: 13 additions & 8 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] = "5d5206637e659f03e006cd8b6b269c49c0c2c697d10517e14dbcea851831e143"
SRC_URI[sha256sum] = "e33a57b0cab75f2fb8bd128be24da0ee18d4a0052e4cd99ad37fcb8dfc9c5875"

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

Expand Down Expand Up @@ -69,7 +69,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/base/third_party/nspr/LICENSE;md5=0806173dfb7e6d060074595e968fd02e \
file://${S}/base/third_party/superfasthash/LICENSE;md5=c66981f8ad23c9f279a5b9e07385128c \
file://${S}/base/third_party/symbolize/LICENSE;md5=17ae3b22fe8fa438966625593e2eea85 \
file://${S}/base/third_party/valgrind/LICENSE;md5=b95c9cb2560f157c60ea60ac1aa69469 \
file://${S}/base/third_party/xdg_user_dirs/LICENSE;md5=d998f250c491c329a8254dd1ca62c647 \
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 \
Expand Down Expand Up @@ -201,6 +200,9 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/angle/src/third_party/volk/LICENSE.md;md5=af213f738e88117b90238ef76ad25ae6 \
file://${S}/third_party/angle/third_party/android_system_sdk/LICENSE;md5=cbb64e76df0f98fc138b1918c089417e \
file://${S}/third_party/angle/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
file://${S}/third_party/angle/third_party/spirv-headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/angle/third_party/spirv-tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/angle/third_party/vulkan-headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/anonymous_tokens/src/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
file://${S}/third_party/apple_apsl/LICENSE;md5=c8c14a9f985552dba8d3edbd76660088 \
file://${S}/third_party/arcore-android-sdk-client/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down Expand Up @@ -270,10 +272,12 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/dav1d/LICENSE;md5=59cb7015cbeea4a8675b9bdb657d41b3 \
file://${S}/third_party/dawn/LICENSE;md5=69558ae12e1997226758845b299ef47b \
file://${S}/third_party/dawn/third_party/khronos/LICENSE;md5=771b3f7a5b9f8aa97259f3d09659e133 \
file://${S}/third_party/dawn/third_party/spirv-headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/dawn/third_party/spirv-tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/dawn/third_party/vulkan-headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/decklink/LICENSE;md5=85b197f7b7b1ef270b01a1b6377be50e \
file://${S}/third_party/devtools-frontend/src/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE;md5=6e381572c3ee395547475a1464db5060 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/codemirror.next/LICENSE;md5=b5494d4f10ac6bb043e5f684e59cd13f \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE;md5=8554e1ee437cc3fb3cfee9ad4a11b8ab \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/csp_evaluator/package/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
Expand All @@ -282,14 +286,13 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE;md5=913015c0e75ff89ef9461fadca555f65 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE;md5=9e398b4fa2d68658c96fd1a3e43a0ce7 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE;md5=449f8b1cf0bfef1e5ec7824a4179ac6f \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay/package/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/LICENSE;md5=b8f1fc4a170646d6f75d9572a3bd1339 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/mitt/LICENSE;md5=dd3fad292d640766ce5bcb6cb97c109e \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs/LICENSE;md5=ddcbb07c54c85eff62e3e6ebab2fa6dd \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data/package/LICENSE.md;md5=d4a904ca135bb7bc912156fee12726f0 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
file://${S}/third_party/devtools-frontend/src/front_end/third_party/web-vitals/package/LICENSE;md5=2c4a96430ec4639e0a80babbfb239a96 \
file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/dom_distiller_js/LICENSE;md5=6cd778870ce5c0c08c8e16fbdf378532 \
file://${S}/third_party/eigen3/LICENSE;md5=48a3fe23ed1353e0995dadfda05ffdb6 \
Expand All @@ -298,7 +301,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/expat/src/expat/COPYING;md5=7b3b078238d0901d3b339289117cb7fb \
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=dbec96c09140718ea111e66592c92e34 \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=a0156e1de86eb34eb5d75486b539aa58 \
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
file://${S}/third_party/flac/COPYING.Xiph;md5=3d6da238b5b57a0965d6730291119f65 \
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
Expand Down Expand Up @@ -371,7 +374,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \
file://${S}/third_party/lss/LICENSE;md5=dcd794613f580ae04e9633662024c7a2 \
file://${S}/third_party/lzma_sdk/LICENSE;md5=eceed1d308734c8051664bc3d1ca175e \
file://${S}/third_party/maldoca/src/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
file://${S}/third_party/material_color_utilities/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
file://${S}/third_party/material_design_icons/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
file://${S}/third_party/material_web_components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down Expand Up @@ -422,6 +424,8 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/smhasher/LICENSE;md5=0d948322ab524e2b74f55eb8ef57c74a \
file://${S}/third_party/snappy/src/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c \
file://${S}/third_party/speech-dispatcher/COPYING.LGPL;md5=4b54a1fd55a448865a0b32d41598759d \
file://${S}/third_party/spirv-headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/spirv-tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/sqlite/LICENSE;md5=7256769d4613c0af5a72be32ba20ccf7 \
file://${S}/third_party/subresource-filter-ruleset/LICENSE;md5=408c32b7944dedb9d57797eca2447ea1 \
file://${S}/third_party/sudden_motion_sensor/LICENSE;md5=6f89397ba4dda73a940f27f76e9ad9d4 \
Expand All @@ -443,7 +447,8 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/vulkan-deps/spirv-headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/spirv-tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/vulkan-headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/vulkan-loader/src/LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac \
file://${S}/third_party/vulkan-headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-loader/src/LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac \
file://${S}/third_party/vulkan_memory_allocator/LICENSE.txt;md5=6eed3e06ed116324029b9de40eaf0ee5 \
file://${S}/third_party/wayland-protocols/gtk/COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://${S}/third_party/wayland-protocols/kde/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 file changed, 48 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 6efe967..a5035c0 100644
index f598fd1..1188401 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1172,27 +1172,6 @@ config("compiler_cpu_abi") {
@@ -1194,27 +1194,6 @@ config("compiler_cpu_abi") {
"-msse3",
]
}
Expand Down Expand Up @@ -50,7 +50,7 @@ index 6efe967..a5035c0 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1200,9 +1179,6 @@ config("compiler_cpu_abi") {
@@ -1222,9 +1201,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mipsel-linux-android" ]
ldflags += [ "--target=mipsel-linux-android" ]
Expand All @@ -60,7 +60,7 @@ index 6efe967..a5035c0 100644
}
} else {
cflags += [ "-EL" ]
@@ -1282,8 +1258,6 @@ config("compiler_cpu_abi") {
@@ -1304,8 +1280,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -69,7 +69,7 @@ index 6efe967..a5035c0 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1331,9 +1305,6 @@ config("compiler_cpu_abi") {
@@ -1353,9 +1327,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mips64el-linux-android" ]
ldflags += [ "--target=mips64el-linux-android" ]
Expand All @@ -79,7 +79,7 @@ index 6efe967..a5035c0 100644
}
} else {
cflags += [
@@ -1391,8 +1362,6 @@ config("compiler_cpu_abi") {
@@ -1413,8 +1384,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -88,7 +88,7 @@ index 6efe967..a5035c0 100644
} else {
cflags += [
"-EB",
@@ -1555,23 +1524,6 @@ config("compiler_deterministic") {
@@ -1577,23 +1546,6 @@ config("compiler_deterministic") {
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ index 80d4b3d..5666cdf 100644
"root_out_dir") +
"/v8_context_snapshot_generator",
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
index c2c11c2..538b69b 100644
index a4faf8e..4c9906d 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2216,6 +2216,7 @@ template("run_torque") {
@@ -2200,6 +2200,7 @@ template("run_torque") {
}

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
root_build_dir),
@@ -2373,6 +2374,7 @@ action("generate_bytecode_builtins_list") {
@@ -2357,6 +2358,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)",
@@ -2412,6 +2414,7 @@ template("run_mksnapshot") {
@@ -2396,6 +2398,7 @@ template("run_mksnapshot") {
data = []

args = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chrome/installer/linux/common/wrapper b/chrome/installer/linux/common/wrapper
index 20c6e8f..d92a60b 100755
index aaa46bf..7d8c8dd 100755
--- a/chrome/installer/linux/common/wrapper
+++ b/chrome/installer/linux/common/wrapper
@@ -45,5 +45,7 @@ exec < /dev/null
@@ -36,5 +36,7 @@ exec < /dev/null
exec > >(exec cat)
exec 2> >(exec cat >&2)

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 a5035c0..220d0da 100644
index 1188401..44975f7 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1820,6 +1820,11 @@ config("default_warnings") {
@@ -1839,6 +1839,11 @@ config("default_warnings") {
}

cflags += [
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 4c71300..6f9423a 100644
index 4ae52e5..dc763a7 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1142,7 +1142,9 @@ component("base") {
@@ -1119,7 +1119,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 6efe967..590a2c2 100644
index 44975f7..604329d 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -568,24 +568,6 @@ config("compiler") {
@@ -575,24 +575,6 @@ config("compiler") {
}
}

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 1a3a7e5..df278db 100644
index 75f1254..3452f3d 100644
--- a/build/config/clang/BUILD.gn
+++ b/build/config/clang/BUILD.gn
@@ -167,14 +167,15 @@ template("clang_lib") {
@@ -183,14 +183,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 @@ -16,17 +16,17 @@ Subject: [PATCH] Adjust the Rust build to our needs
Upstream-Status: Inappropriate [specific to our build setup]
Signed-off-by: Max Ihlenfeldt <max@igalia.com>
---
build/config/rust.gni | 24 ++++++++++++++++++------
build/config/rust.gni | 26 +++++++++++++++++++-------
build/rust/rustc_wrapper.py | 1 +
build/rust/std/BUILD.gn | 28 +++++++++++++++++++++-------
build/rust/std/find_std_rlibs.py | 16 +++++++++++-----
4 files changed, 51 insertions(+), 18 deletions(-)
4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/build/config/rust.gni b/build/config/rust.gni
index e99d7d0..784a845 100644
index 97e788a..5b5ff86 100644
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -93,6 +93,11 @@ declare_args() {
@@ -97,6 +97,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 e99d7d0..784a845 100644
}

# Use a separate declare_args so these variables' defaults can depend on the
@@ -188,12 +193,19 @@ if (enable_rust) {
@@ -184,12 +189,19 @@ if (enable_rust) {
# other toolchains.
rust_abi_target = ""
if (is_linux || is_chromeos) {
Expand All @@ -61,7 +61,7 @@ index e99d7d0..784a845 100644
} else if (current_cpu == "arm") {
if (arm_float_abi == "hard") {
float_suffix = "hf"
@@ -202,13 +214,13 @@ if (is_linux || is_chromeos) {
@@ -198,15 +210,15 @@ if (is_linux || is_chromeos) {
}
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
# No way to inform Rust about the -a suffix.
Expand All @@ -71,6 +71,9 @@ index e99d7d0..784a845 100644
- rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix
+ rust_abi_target = "arm" + vendor + "-linux-gnueabi" + float_suffix
}
} else if (current_cpu == "riscv64") {
- rust_abi_target = "riscv64gc-unknown-linux-gnu"
+ rust_abi_target = "riscv64gc" + vendor + "-linux-gnu"
} else {
# Best guess for other future platforms.
- rust_abi_target = current_cpu + "-unknown-linux-gnu"
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 d20af89..457ec58 100644
index 86fb3da..31d23fc 100644
--- a/build/rust/std/BUILD.gn
+++ b/build/rust/std/BUILD.gn
@@ -90,7 +90,6 @@ if (toolchain_has_rust) {
Expand Down
Loading