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
12 changes: 6 additions & 6 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] = "c883f192af7cb76cf46de4044349645b0fb0b5c42a1c0f7950a24c825c17f885"
SRC_URI[sha256sum] = "6d6dc8b943012573a244ddb013b281ecbc97f77fe1fc6f55a4118241d107eba5"

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

Expand Down Expand Up @@ -222,7 +222,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/cardboard/LICENSE;md5=3446ed11f63049b8f1e60e833dcdc5b7 \
file://${S}/third_party/cast_core/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
file://${S}/third_party/catapult/experimental/trace_on_tap/third_party/pako/LICENSE;md5=6b8c8aad0a85200097ec8f989636baf0 \
file://${S}/third_party/catapult/third_party/WebOb/docs/license.txt;md5=8ed3584bcc78c16da363747ccabc5af5 \
file://${S}/third_party/catapult/third_party/apiclient/LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3 \
file://${S}/third_party/catapult/third_party/cachetools/LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5 \
file://${S}/third_party/catapult/third_party/chardet/LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343 \
Expand Down Expand Up @@ -288,6 +287,8 @@ LIC_FILES_CHKSUM = "\
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/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand All @@ -298,7 +299,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=c1235892a92f75dfbc599772072869cd \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=a1624152b484ce949c0db957a428ac07 \
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 @@ -400,6 +401,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/polymer/LICENSE.polymer;md5=324f45ce459ffd97e41d175a4e95a4be \
file://${S}/third_party/private-join-and-compute/src/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
file://${S}/third_party/private_membership/LICENSE;md5=9d44acd6df6b90cbbabbd467d67e74c7 \
file://${S}/third_party/protobuf-javascript/LICENSE;md5=d7cb3a2a94c3207cec955e5f8a3149db \
file://${S}/third_party/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
file://${S}/third_party/pthreadpool/src/LICENSE;md5=1609499688b503850848d795dce4da2d \
file://${S}/third_party/puffin/LICENSE;md5=b1ed361f9fc790c1054d81a7ef041a34 \
Expand All @@ -411,7 +413,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \
file://${S}/third_party/selenium-atoms/LICENSE.closure;md5=e23fadd6ceef8c618fc1c65191d846fa \
file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=418d0239a1435dae6b5c2e919a75f8c9 \
file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=7a9495742f21b7624515e120b720cc65 \
file://${S}/third_party/selenium-atoms/LICENSE.wgxpath;md5=73a4131394317651a4370c0507a9ccb5 \
file://${S}/third_party/sentencepiece/LICENSE;md5=5cb9ee2840d20280145e929f30f32060 \
file://${S}/third_party/setupdesign/LICENSE;md5=302a09339e8de37ba06c121279be1707 \
Expand Down Expand Up @@ -465,6 +467,4 @@ LIC_FILES_CHKSUM = "\
file://${S}/tools/mac/power/protos/third_party/pprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
file://${S}/v8/LICENSE;md5=f38a2942edcfe4abb45e9a83a1ad2f82 \
file://${S}/v8/LICENSE.fdlibm;md5=b17367d6c97e638599071d99a3049dfe \
file://${S}/v8/LICENSE.strongtalk;md5=956a43818dd13f2e93088fc2c93589d2 \
"
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 3c7b4d8..19ea87a 100644
index bd7dd25..83d2298 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1174,11 +1174,6 @@ config("compiler_cpu_abi") {
@@ -1180,11 +1180,6 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
Expand All @@ -36,7 +36,7 @@ index 3c7b4d8..19ea87a 100644
if (!is_nacl) {
cflags += [
"-march=$arm_arch",
@@ -1188,12 +1183,6 @@ config("compiler_cpu_abi") {
@@ -1194,12 +1189,6 @@ config("compiler_cpu_abi") {
if (arm_tune != "") {
cflags += [ "-mtune=$arm_tune" ]
}
Expand All @@ -49,7 +49,7 @@ index 3c7b4d8..19ea87a 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1201,9 +1190,6 @@ config("compiler_cpu_abi") {
@@ -1207,9 +1196,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 3c7b4d8..19ea87a 100644
}
} else {
cflags += [ "-EL" ]
@@ -1283,8 +1269,6 @@ config("compiler_cpu_abi") {
@@ -1289,8 +1275,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -68,7 +68,7 @@ index 3c7b4d8..19ea87a 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1332,9 +1316,6 @@ config("compiler_cpu_abi") {
@@ -1338,9 +1322,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 3c7b4d8..19ea87a 100644
}
} else {
cflags += [
@@ -1392,8 +1373,6 @@ config("compiler_cpu_abi") {
@@ -1398,8 +1379,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -87,7 +87,7 @@ index 3c7b4d8..19ea87a 100644
} else {
cflags += [
"-EB",
@@ -1556,23 +1535,6 @@ config("compiler_deterministic") {
@@ -1562,23 +1541,6 @@ config("compiler_deterministic") {
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@ index 6b38d3f..7771a69 100644
"root_out_dir") +
"/v8_context_snapshot_generator",
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
index a28da02..c32fd9e 100644
index a25b6f2..abc441f 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2181,6 +2181,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),
@@ -2338,6 +2339,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)",
@@ -2377,6 +2379,7 @@ template("run_mksnapshot") {
@@ -2396,6 +2398,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),
@@ -7165,6 +7168,7 @@ if (v8_enable_i18n_support) {
@@ -7221,6 +7224,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,13 +13,13 @@ 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 19ea87a..e923392 100644
index bd7dd25..c1183ff 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1821,6 +1821,11 @@ config("default_warnings") {
cflags += [
"-Wenum-compare-conditional",
@@ -1872,6 +1872,11 @@ config("default_warnings") {
}

cflags += [
+ # Disable unknown warnings, since system clang may not have
+ # backported newer warning yet unlike internal clang that
+ # chromium uses.
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 a989a35..a94c7de 100644
index 25356ec..b19314f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1126,7 +1126,9 @@ component("base") {
@@ -1131,7 +1131,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,7 +17,7 @@ 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 e923392..41b5a94 100644
index 83d2298..00894fe 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -613,24 +613,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 5f17171..d90a7e0 100644
index e639905..62279fc 100644
--- a/build/config/clang/BUILD.gn
+++ b/build/config/clang/BUILD.gn
@@ -147,14 +147,15 @@ template("clang_lib") {
@@ -156,14 +156,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 @@ -23,7 +23,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/build/config/rust.gni b/build/config/rust.gni
index 9b0ee75..b2866b3 100644
index 23d713b..7a10f5b 100644
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -98,6 +98,11 @@ declare_args() {
Expand All @@ -38,7 +38,7 @@ index 9b0ee75..b2866b3 100644
}

# Use a separate declare_args so these variables' defaults can depend on the
@@ -196,12 +201,19 @@ if (enable_rust) {
@@ -193,12 +198,19 @@ if (enable_rust) {
# other toolchains.
rust_abi_target = ""
if (is_linux || is_chromeos) {
Expand All @@ -61,7 +61,7 @@ index 9b0ee75..b2866b3 100644
} else if (current_cpu == "arm") {
if (arm_float_abi == "hard") {
float_suffix = "hf"
@@ -210,13 +222,13 @@ if (is_linux || is_chromeos) {
@@ -207,13 +219,13 @@ if (is_linux || is_chromeos) {
}
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
# No way to inform Rust about the -a suffix.
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 9c3db1e..8824200 100644
index 6d9b684..66206f5 100644
--- a/build/rust/std/BUILD.gn
+++ b/build/rust/std/BUILD.gn
@@ -90,7 +90,6 @@ if (toolchain_has_rust) {
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 41b5a94..2314d18 100644
index 00894fe..8b9b381 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1155,16 +1155,6 @@ config("compiler_cpu_abi") {
@@ -1161,16 +1161,6 @@ config("compiler_cpu_abi") {
"-msse3",
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index 5691d26..b590c09 100644
index feaef4b..a68973e 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -109,7 +109,7 @@ if (enable_rust_boringssl) {
@@ -110,7 +110,7 @@ if (enable_rust) {
}
}

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

diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
index 47aad96..6833680 100644
index bf03e44..a85a30f 100644
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -113,6 +113,7 @@ static_library("devtools") {
Expand All @@ -29,10 +29,10 @@ index 47aad96..6833680 100644
"//content/public/browser",
"//net",
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 2f5e88a..4b5bfff 100644
index e488b14..32d0981 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -854,6 +854,7 @@ static_library("extensions") {
@@ -862,6 +862,7 @@ static_library("extensions") {
"//components/embedder_support",
"//components/embedder_support:browser_util",
"//components/enterprise",
Expand All @@ -41,7 +41,7 @@ index 2f5e88a..4b5bfff 100644
"//components/feedback",
"//components/gcm_driver",
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
index df78bff..52848f3 100644
index 3c300d1..66e8f05 100644
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -31,6 +31,7 @@ static_library("safe_browsing") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ Signed-off-by: Daniel Semkowicz <dse@thaumatec.com>
1 file changed, 1 insertion(+)

diff --git a/chrome/browser/resources/new_tab_page/BUILD.gn b/chrome/browser/resources/new_tab_page/BUILD.gn
index 83736b4..64b5a0b 100644
index c7949e8..369e078 100644
--- a/chrome/browser/resources/new_tab_page/BUILD.gn
+++ b/chrome/browser/resources/new_tab_page/BUILD.gn
@@ -104,6 +104,7 @@ build_webui("build") {
@@ -101,6 +101,7 @@ build_webui("build") {
"//ui/webui/resources/cr_components/color_change_listener:build_ts",
"//ui/webui/resources/cr_components/customize_themes:build_ts",
"//ui/webui/resources/cr_components/help_bubble:build_ts",
Expand Down