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
4 changes: 1 addition & 3 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ OUTPUT_DIR = "out/Release"
B = "${S}/${OUTPUT_DIR}"

# Backported patches.
SRC_URI += "\
file://backport/Add-missing-components-enterprise-buildflag.patch \
"
# (none, currently \o/)

# Non-specific patches.
SRC_URI += "\
Expand Down
14 changes: 5 additions & 9 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] = "9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603"
SRC_URI[sha256sum] = "5d5206637e659f03e006cd8b6b269c49c0c2c697d10517e14dbcea851831e143"

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

Expand Down Expand Up @@ -66,7 +66,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/base/third_party/cityhash/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
file://${S}/base/third_party/cityhash_v103/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
file://${S}/base/third_party/double_conversion/LICENSE;md5=1ea35644f0ec0d9767897115667e901f \
file://${S}/base/third_party/dynamic_annotations/LICENSE;md5=b6bd7011ecc1a4f7ac3525589f45e565 \
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 \
Expand Down Expand Up @@ -138,13 +137,10 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_iid/LICENSE;md5=05fc50851d6d550ef2bb400b326353f0 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/LICENSE;md5=cd033bdb088af16ecdbcd95bd5562a30 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_location/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_location/LICENSE;md5=6a7afdc2d1780ac0a9bd21bd59640cdf \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_stats/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tflite_impl/LICENSE;md5=b3ff0b3c1f1ae4bfec52d02f9ebee09b \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tflite_java/LICENSE;md5=2748ed5b9bbbde8a6dcec3d59a1a88a1 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
Expand Down Expand Up @@ -190,7 +186,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/org_tensorflow_tensorflow_lite_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
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 \
Expand Down Expand Up @@ -265,6 +260,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/coremltools/mlmodel/format/LICENSE;md5=646b3097f3a7222ada5b4561c39d52e8 \
file://${S}/third_party/cpu_features/src/LICENSE;md5=31a8379f6fe09baf921e654832ac5700 \
file://${S}/third_party/cpuinfo/src/LICENSE;md5=cabca80e8e4a4bbe90e9a4b4ad53f5f4 \
file://${S}/third_party/crabbyavif/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/crashpad/crashpad/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/crashpad/crashpad/third_party/getopt/LICENSE;md5=f7413523e1c0b3a644fd6bbbc33b6296 \
file://${S}/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE;md5=dacaafbaf91483700da837d31213a1e8 \
Expand Down Expand Up @@ -302,7 +298,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=a1624152b484ce949c0db957a428ac07 \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=dbec96c09140718ea111e66592c92e34 \
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 @@ -430,7 +426,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/subresource-filter-ruleset/LICENSE;md5=408c32b7944dedb9d57797eca2447ea1 \
file://${S}/third_party/sudden_motion_sensor/LICENSE;md5=6f89397ba4dda73a940f27f76e9ad9d4 \
file://${S}/third_party/swiftshader/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87 \
file://${S}/third_party/swiftshader/third_party/SPIRV-Headers/LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d \
file://${S}/third_party/swiftshader/third_party/SPIRV-Headers/LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741 \
file://${S}/third_party/swiftshader/third_party/SPIRV-Tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/tensorflow-text/LICENSE;md5=01e86893010a1b87e69a213faa753ebd \
file://${S}/third_party/tensorflow_models/src/LICENSE;md5=6f798069926aa738ee3bbbcac6c62a2f \
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 973d8bc..f0ffab2 100644
index 6efe967..a5035c0 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1197,27 +1197,6 @@ config("compiler_cpu_abi") {
@@ -1172,27 +1172,6 @@ config("compiler_cpu_abi") {
"-msse3",
]
}
Expand Down Expand Up @@ -50,7 +50,7 @@ index 973d8bc..f0ffab2 100644
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -1225,9 +1204,6 @@ config("compiler_cpu_abi") {
@@ -1200,9 +1179,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 973d8bc..f0ffab2 100644
}
} else {
cflags += [ "-EL" ]
@@ -1307,8 +1283,6 @@ config("compiler_cpu_abi") {
@@ -1282,8 +1258,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -69,7 +69,7 @@ index 973d8bc..f0ffab2 100644
} else {
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
@@ -1356,9 +1330,6 @@ config("compiler_cpu_abi") {
@@ -1331,9 +1305,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 973d8bc..f0ffab2 100644
}
} else {
cflags += [
@@ -1416,8 +1387,6 @@ config("compiler_cpu_abi") {
@@ -1391,8 +1362,6 @@ config("compiler_cpu_abi") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
if (is_clang) {
Expand All @@ -88,7 +88,7 @@ index 973d8bc..f0ffab2 100644
} else {
cflags += [
"-EB",
@@ -1580,23 +1549,6 @@ config("compiler_deterministic") {
@@ -1555,23 +1524,6 @@ config("compiler_deterministic") {
}
}
}
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, 5 insertions(+)

diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
index 6b38d3f..7771a69 100644
index 80d4b3d..5666cdf 100644
--- a/tools/v8_context_snapshot/BUILD.gn
+++ b/tools/v8_context_snapshot/BUILD.gn
@@ -44,6 +44,7 @@ if (use_v8_context_snapshot) {
@@ -45,6 +45,7 @@ if (use_v8_context_snapshot) {
output_path = rebase_path(output_file, root_build_dir)

args = [
Expand All @@ -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 79b95fb..1e9862d 100644
index c2c11c2..538b69b 100644
--- a/v8/BUILD.gn
+++ b/v8/BUILD.gn
@@ -2214,6 +2214,7 @@ template("run_torque") {
@@ -2216,6 +2216,7 @@ template("run_torque") {
}

args = [
+ "./v8-qemu-wrapper.sh",
"./" + rebase_path(
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
root_build_dir),
@@ -2371,6 +2372,7 @@ action("generate_bytecode_builtins_list") {
@@ -2373,6 +2374,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)",
@@ -2410,6 +2412,7 @@ template("run_mksnapshot") {
@@ -2412,6 +2414,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),
@@ -7251,6 +7254,7 @@ if (v8_enable_i18n_support) {
@@ -7287,6 +7290,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 973d8bc..0f2b8f6 100644
index a5035c0..220d0da 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1893,6 +1893,11 @@ config("default_warnings") {
@@ -1820,6 +1820,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 5dc15da..2b83e1c 100644
index 4c71300..6f9423a 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1141,7 +1141,9 @@ component("base") {
@@ -1142,7 +1142,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,16 +17,16 @@ 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 973d8bc..c0f6a49 100644
index 6efe967..590a2c2 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -610,24 +610,6 @@ config("compiler") {
@@ -568,24 +568,6 @@ config("compiler") {
}
}

- # TODO(crbug.com/1488374): This causes binary size growth and potentially
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
- # other problems.
- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
- if (default_toolchain != "//build/toolchain/cros:target" &&
- !llvm_android_mainline) {
- cflags += [
Expand All @@ -42,6 +42,6 @@ index 973d8bc..c0f6a49 100644
- }
- }
-
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
# TODO(crbug.com/40192287): Investigate why/if this should be needed.
if (is_win) {
cflags += [ "/clang:-ffp-contract=off" ]
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 498b3eb..421c1d7 100644
index 1a3a7e5..df278db 100644
--- a/build/config/clang/BUILD.gn
+++ b/build/config/clang/BUILD.gn
@@ -165,14 +165,15 @@ template("clang_lib") {
@@ -167,14 +167,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 59fa144..a6131a6 100644
index e99d7d0..784a845 100644
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -93,6 +93,11 @@ declare_args() {
Expand Down Expand Up @@ -91,7 +91,7 @@ index b8e490d..d22cf08 100755
abs_build_root = os.getcwd().replace('\\', '/') + '/'
is_windows = sys.platform == 'win32' or args.target_windows
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
index b6d570d..7b7b213 100644
index 86fb3da..d20af89 100644
--- a/build/rust/std/BUILD.gn
+++ b/build/rust/std/BUILD.gn
@@ -179,7 +179,8 @@ if (toolchain_has_rust) {
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 7b7b213..e1f9e01 100644
index d20af89..457ec58 100644
--- a/build/rust/std/BUILD.gn
+++ b/build/rust/std/BUILD.gn
@@ -90,7 +90,6 @@ if (toolchain_has_rust) {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ B = "${S}/out_bootstrap"

SRC_URI += " \
file://0001-Pass-no-static-libstdc-to-gen.py.patch \
file://gn-bootstrap-Don-t-pass-removed-dupbuild-ninja-optio.patch \
"

# The build system expects the linker to be invoked via the compiler. If we use
Expand Down

This file was deleted.