Skip to content

Commit 038c60d

Browse files
chromium: update to 119.0.6045.159 (#771)
Release notes: https://chromereleases.googleblog.com/2023/10/stable-channel-update-for-desktop_31.html https://chromereleases.googleblog.com/2023/11/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2023/11/stable-channel-update-for-desktop_14.html Build and patch changes: ------------------------ Drop five backported patches that are included upstream now, and add five new backports. Add more fixes to 0017-Avoid-parenthesized-initialization-of-aggregates.patch. Add 0021-Don-t-delete-CrashKeyWithName-dtor.patch to fix a build error on older versions of clang (on mickledore, kirkstone, and dunfell). Rebase remaining patches. License changes: ---------------- Added licenses: * third_party/android_deps/libs/com_google_auto_service_auto_service_annotations/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4887649 * third_party/jszip/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4793948 * third_party/wayland-protocols/gtk/COPYING, third_party/wayland-protocols/kde/COPYING.LIB - https://chromium-review.googlesource.com/c/chromium/src/+/4845816 Removed licenses: * third_party/android_deps/libs/android_arch_lifecycle_common_java8/LICENSE, third_party/android_deps/libs/com_android_support_animated_vector_drawable/LICENSE, third_party/android_deps/libs/com_android_support_appcompat_v7/LICENSE, third_party/android_deps/libs/com_android_support_cardview_v7/LICENSE, third_party/android_deps/libs/com_android_support_design/LICENSE, third_party/android_deps/libs/com_android_support_multidex/LICENSE, third_party/android_deps/libs/com_android_support_recyclerview_v7/LICENSE, third_party/android_deps/libs/com_android_support_support_fragment/LICENSE, third_party/android_deps/libs/com_android_support_support_media_compat/LICENSE, third_party/android_deps/libs/com_android_support_support_v4/LICENSE, third_party/android_deps/libs/com_android_support_support_vector_drawable/LICENSE, third_party/android_deps/libs/com_android_support_transition/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4904153 Updated licenses: none. Test-built (big thanks to @nrpt-m): ----------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - mickledore, clang, MACHINE=qemuarm64, qemux86-64 - kirkstone, clang, MACHINE=qemux86-64, raspberrypi4-64 - dunfell, clang**, MACHINE=qemux86-64 * chromium-x11 - master, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - mickledore, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - kirkstone, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - dunfell, clang**, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64*** ** Please note that Chromium requires below set-up when on dunfell branch. - The clang version to be >= 14 and for that, use the latest meta-clang/dunfell-clang14 branch. - Require the latest meta-oe with Nodejs 14.x support. - Add the PREFERRED_VERSION_nodejs-native = "14.%" in conf/local.conf file. *** Please note that there currently is a problem on RPi4/dunfell where Chromium crashes because of an illegal instruction error. Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 parent 82e2184 commit 038c60d

File tree

36 files changed

+1968
-636
lines changed

36 files changed

+1968
-636
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ B = "${S}/${OUTPUT_DIR}"
1212

1313
# Backported patches.
1414
SRC_URI += "\
15-
file://backport/IWYU-for-ui-events-gesture_detection-motion.patch \
16-
file://backport/Remove-std-ranges-usage.patch \
17-
file://backport/lacros-Include-string_view-from-net-cert-pk.patch \
18-
file://backport/IWYU-Add-includes-for-size_t-and-int64_t-us.patch \
1915
file://backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch \
20-
file://backport/Initialize-ServerCvc-with-designated-initia.patch \
2116
file://backport/IWYU-for-net-filter-zstd_source_stream.cc.patch \
17+
file://backport/Replace-std-ranges-which-is-banned-c-20-fea.patch \
18+
file://backport/IWYU-for-components-user_education-common-p.patch \
19+
file://backport/MiracleParameter-Improve-MiracleParameter-s.patch \
20+
file://backport/Replace-std-ranges-with-base-ranges.patch \
21+
file://backport/atspi-mark-possibly-unused-gn-variables.patch \
2222
"
2323
# Non-specific patches.
2424
SRC_URI += "\
@@ -42,6 +42,7 @@ SRC_URI += "\
4242
file://0018-Fix-constexpr-variable-cannot-have-non-literal-type-.patch \
4343
file://0019-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch \
4444
file://0020-Fix-implicitly-deleted-default-constructor-build-err.patch \
45+
file://0021-Don-t-delete-CrashKeyWithName-dtor.patch \
4546
"
4647
# ARM/AArch64-specific patches.
4748
SRC_URI:append:arm = "\

meta-chromium/recipes-browser/chromium/chromium.inc

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[sha256sum] = "7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786"
7+
SRC_URI[sha256sum] = "d0d842712805ac81582dc0fecd4396fbf4380713df2fb50ceeb853dd38d1538f"
88

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

@@ -102,39 +102,27 @@ LIC_FILES_CHKSUM = "\
102102
file://${S}/third_party/android_deps/libs/android_arch_core_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
103103
file://${S}/third_party/android_deps/libs/android_arch_core_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
104104
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
105-
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_common_java8/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
106105
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_livedata/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
107106
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_livedata_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
108107
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
109108
file://${S}/third_party/android_deps/libs/android_arch_lifecycle_viewmodel/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
110-
file://${S}/third_party/android_deps/libs/com_android_support_animated_vector_drawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
111-
file://${S}/third_party/android_deps/libs/com_android_support_appcompat_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
112109
file://${S}/third_party/android_deps/libs/com_android_support_asynclayoutinflater/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
113-
file://${S}/third_party/android_deps/libs/com_android_support_cardview_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
114110
file://${S}/third_party/android_deps/libs/com_android_support_collections/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
115111
file://${S}/third_party/android_deps/libs/com_android_support_coordinatorlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
116112
file://${S}/third_party/android_deps/libs/com_android_support_cursoradapter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
117113
file://${S}/third_party/android_deps/libs/com_android_support_customview/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
118-
file://${S}/third_party/android_deps/libs/com_android_support_design/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
119114
file://${S}/third_party/android_deps/libs/com_android_support_documentfile/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
120115
file://${S}/third_party/android_deps/libs/com_android_support_drawerlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
121116
file://${S}/third_party/android_deps/libs/com_android_support_interpolator/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
122117
file://${S}/third_party/android_deps/libs/com_android_support_loader/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
123118
file://${S}/third_party/android_deps/libs/com_android_support_localbroadcastmanager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
124-
file://${S}/third_party/android_deps/libs/com_android_support_multidex/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
125119
file://${S}/third_party/android_deps/libs/com_android_support_print/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
126-
file://${S}/third_party/android_deps/libs/com_android_support_recyclerview_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
127120
file://${S}/third_party/android_deps/libs/com_android_support_slidingpanelayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
128121
file://${S}/third_party/android_deps/libs/com_android_support_support_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
129122
file://${S}/third_party/android_deps/libs/com_android_support_support_compat/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
130123
file://${S}/third_party/android_deps/libs/com_android_support_support_core_ui/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
131124
file://${S}/third_party/android_deps/libs/com_android_support_support_core_utils/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
132-
file://${S}/third_party/android_deps/libs/com_android_support_support_fragment/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
133-
file://${S}/third_party/android_deps/libs/com_android_support_support_media_compat/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
134-
file://${S}/third_party/android_deps/libs/com_android_support_support_v4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
135-
file://${S}/third_party/android_deps/libs/com_android_support_support_vector_drawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
136125
file://${S}/third_party/android_deps/libs/com_android_support_swiperefreshlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
137-
file://${S}/third_party/android_deps/libs/com_android_support_transition/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
138126
file://${S}/third_party/android_deps/libs/com_android_support_versionedparcelable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
139127
file://${S}/third_party/android_deps/libs/com_android_support_viewpager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
140128
file://${S}/third_party/android_deps/libs/com_google_android_annotations/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
@@ -162,6 +150,7 @@ LIC_FILES_CHKSUM = "\
162150
file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
163151
file://${S}/third_party/android_deps/libs/com_google_android_play_core_common/LICENSE;md5=8194dd288cb886b87752b09da8cd9287 \
164152
file://${S}/third_party/android_deps/libs/com_google_android_play_feature_delivery/LICENSE;md5=f2f92822aef2474358b9e1d21514e278 \
153+
file://${S}/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
165154
file://${S}/third_party/android_deps/libs/com_google_code_findbugs_jsr305/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
166155
file://${S}/third_party/android_deps/libs/com_google_code_gson_gson/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
167156
file://${S}/third_party/android_deps/libs/com_google_dagger_dagger/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -290,6 +279,7 @@ LIC_FILES_CHKSUM = "\
290279
file://${S}/third_party/jni_zero/LICENSE;md5=70dc659673a50c63e07b2287222230e6 \
291280
file://${S}/third_party/jsoncpp/LICENSE;md5=c56ee55c03a55f8105b969d8270632ce \
292281
file://${S}/third_party/jstemplate/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
282+
file://${S}/third_party/jszip/LICENSE;md5=401d270383d75b05d76fc13fc1750765 \
293283
file://${S}/third_party/khronos/LICENSE;md5=1d2ef853a9ae7ace4e16fda0d48f597b \
294284
file://${S}/third_party/leveldatabase/src/LICENSE;md5=92d1b128950b11ba8495b64938fc164d \
295285
file://${S}/third_party/libaddressinput/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -393,6 +383,8 @@ LIC_FILES_CHKSUM = "\
393383
file://${S}/third_party/vulkan-deps/vulkan-headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
394384
file://${S}/third_party/vulkan-deps/vulkan-loader/src/LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac \
395385
file://${S}/third_party/vulkan_memory_allocator/LICENSE.txt;md5=28469cb09e41bc708efbb6a69fb39a29 \
386+
file://${S}/third_party/wayland-protocols/gtk/COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
387+
file://${S}/third_party/wayland-protocols/kde/COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
396388
file://${S}/third_party/wayland-protocols/src/COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
397389
file://${S}/third_party/wayland/src/COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
398390
file://${S}/third_party/webrtc/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \

meta-chromium/recipes-browser/chromium/files/0001-limit-number-of-LTO-jobs.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
1717
2 files changed, 11 insertions(+), 6 deletions(-)
1818

1919
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
20-
index 06812fb..2a810d9 100644
20+
index 6d05512..8b22e38 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
2323
@@ -721,7 +721,7 @@ config("compiler") {
@@ -47,10 +47,10 @@ index 06812fb..2a810d9 100644
4747
ldflags += [
4848
"-Wl,-cache_path_lto," +
4949
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
50-
index 1871701..8f5b3d4 100644
50+
index b1d9297..4c7f32c 100644
5151
--- a/build/config/compiler/compiler.gni
5252
+++ b/build/config/compiler/compiler.gni
53-
@@ -99,6 +99,11 @@ declare_args() {
53+
@@ -98,6 +98,11 @@ declare_args() {
5454
# If true, use Goma for ThinLTO code generation where applicable.
5555
use_goma_thin_lto = false
5656

meta-chromium/recipes-browser/chromium/files/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
2121
1 file changed, 38 deletions(-)
2222

2323
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
24-
index 2a810d9..f991efd 100644
24+
index 8b22e38..cc8eac8 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1112,11 +1112,6 @@ config("compiler_cpu_abi") {
27+
@@ -1133,11 +1133,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index 2a810d9..f991efd 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1126,12 +1121,6 @@ config("compiler_cpu_abi") {
39+
@@ -1147,12 +1142,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index 2a810d9..f991efd 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1139,9 +1128,6 @@ config("compiler_cpu_abi") {
52+
@@ -1160,9 +1149,6 @@ config("compiler_cpu_abi") {
5353
if (is_android) {
5454
cflags += [ "--target=mipsel-linux-android" ]
5555
ldflags += [ "--target=mipsel-linux-android" ]
@@ -59,7 +59,7 @@ index 2a810d9..f991efd 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1221,8 +1207,6 @@ config("compiler_cpu_abi") {
62+
@@ -1242,8 +1228,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index 2a810d9..f991efd 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1270,9 +1254,6 @@ config("compiler_cpu_abi") {
71+
@@ -1291,9 +1275,6 @@ config("compiler_cpu_abi") {
7272
if (is_android) {
7373
cflags += [ "--target=mips64el-linux-android" ]
7474
ldflags += [ "--target=mips64el-linux-android" ]
@@ -78,7 +78,7 @@ index 2a810d9..f991efd 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1330,8 +1311,6 @@ config("compiler_cpu_abi") {
81+
@@ -1351,8 +1332,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index 2a810d9..f991efd 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1494,23 +1473,6 @@ config("compiler_deterministic") {
90+
@@ -1515,23 +1494,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}

meta-chromium/recipes-browser/chromium/files/0003-v8-qemu-wrapper.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,34 @@ index 52504f4..40425d6 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index dd97c4f..c3961b0 100644
32+
index 025203d..0c196bb 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2137,6 +2137,7 @@ template("run_torque") {
35+
@@ -2134,6 +2134,7 @@ template("run_torque") {
3636
}
3737

3838
args = [
3939
+ "./v8-qemu-wrapper.sh",
4040
"./" + rebase_path(
4141
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
4242
root_build_dir),
43-
@@ -2294,6 +2295,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2291,6 +2292,7 @@ action("generate_bytecode_builtins_list") {
4444
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
4545
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
4646
args = [
4747
+ "./v8-qemu-wrapper.sh",
4848
"./" + rebase_path(
4949
get_label_info(
5050
":bytecode_builtins_list_generator($v8_generator_toolchain)",
51-
@@ -2333,6 +2335,7 @@ template("run_mksnapshot") {
51+
@@ -2330,6 +2332,7 @@ template("run_mksnapshot") {
5252
data = []
5353

5454
args = [
5555
+ "./v8-qemu-wrapper.sh",
5656
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
5757
"root_out_dir") + "/mksnapshot",
5858
root_build_dir),
59-
@@ -6882,6 +6885,7 @@ if (v8_enable_i18n_support) {
59+
@@ -6931,6 +6934,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

meta-chromium/recipes-browser/chromium/files/0005-Delete-compiler-options-not-available-in-release-ver.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1313
1 file changed, 5 insertions(+)
1414

1515
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index f991efd..0b69949 100644
16+
index cc8eac8..65b2b2d 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1735,6 +1735,11 @@ config("default_warnings") {
19+
@@ -1777,6 +1777,11 @@ config("default_warnings") {
2020
cflags += [
2121
"-Wenum-compare-conditional",
2222

meta-chromium/recipes-browser/chromium/files/0006-avoid-link-latomic-failure-on-CentOS-8-host.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 82cb596..5eb1a6d 100644
21+
index 55479f4..da031c1 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1111,7 +1111,9 @@ component("base") {
24+
@@ -1101,7 +1101,9 @@ component("base") {
2525
# Needed for <atomic> if using newer C++ library than sysroot, except if
2626
# building inside the cros_sdk environment - use host_toolchain as a
2727
# more robust check for this.

meta-chromium/recipes-browser/chromium/files/0007-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
2424
2 files changed, 11 insertions(+), 17 deletions(-)
2525

2626
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
27-
index 0b69949..00fa15a 100644
27+
index 65b2b2d..f8777fe 100644
2828
--- a/build/config/compiler/BUILD.gn
2929
+++ b/build/config/compiler/BUILD.gn
30-
@@ -1412,7 +1412,6 @@ config("compiler_codegen") {
30+
@@ -1433,7 +1433,6 @@ config("compiler_codegen") {
3131
config("compiler_deterministic") {
3232
cflags = []
3333
ldflags = []
3434
- swiftflags = []
3535

3636
# Eliminate build metadata (__DATE__, __TIME__ and __TIMESTAMP__) for
3737
# deterministic build. See https://crbug.com/314403
38-
@@ -1441,20 +1440,12 @@ config("compiler_deterministic") {
38+
@@ -1462,20 +1461,12 @@ config("compiler_deterministic") {
3939
# different build directory like "out/feature_a" and "out/feature_b" if
4040
# we build same files with same compile flag.
4141
# Other paths are already given in relative, no need to normalize them.
@@ -63,7 +63,7 @@ index 0b69949..00fa15a 100644
6363
# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
6464
asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
6565
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
66-
index 8f5b3d4..e667d97 100644
66+
index 4c7f32c..b09cd2d 100644
6767
--- a/build/config/compiler/compiler.gni
6868
+++ b/build/config/compiler/compiler.gni
6969
@@ -268,8 +268,11 @@ declare_args() {

0 commit comments

Comments
 (0)