Skip to content

Commit 8a2ec20

Browse files
committed
chromium: 144.0.7559.132
Release Notes: https://chromereleases.googleblog.com/2026/02/stable-channel-update-for-desktop.html Build and patch changes: ------------------------ generate_license_list.py was fixed to generate the license list correctly. Fixed do_copy_clang_library() for the new version when BUILD_ARCH != TARGET_ARCH. Removed patches: None Modified patches: * 0009-Adjust-the-Rust-build-to-our-needs.patch * 0013-Reduce-minimum-browser-window-width-to-480px.patch * chromium-142-crabbyavif-rust18x.patch New patches: * use-adler2.patch Chromium 144 makes it conditional on "nightly" whether to use adler2. For released Rust versions, it wants to use adler. This doesn't work in Rust 1.9x in Yocto 5.3/6.0. License changes: ---------------- Added licenses: * third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_time/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_curtains_curtains/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android_core/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android_utils/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_core/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_gc/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android_androidx/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android_core/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_plumber_android/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_plumber_android_core/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_android/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_graph/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_hprof/LICENSE * third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_log/LICENSE * third_party/androidx/committed/libs/androidx_tracing_tracing_ktx/LICENSE * third_party/androidx/committed/libs/androidx_work_work_multiprocess/LICENSE * third_party/androidx/committed/libs/androidx_work_work_runtime/LICENSE Removed licenses: * third_party/android_deps/libs/com_android_support_support_annotations/LICENSE Updated licenses: * base/third_party/nspr/LICENSE * third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast/LICENSE * third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast_framework/LICENSE * third_party/icu/LICENSE * third_party/screen-ai/THIRD_PARTY_LICENSES Test-built: ----------- * chromium-ozone-wayland * MACHINE=intel-corei7-64, qemuarm64 * chromium-x11 * MACHINE=intel-corei7-64, qemuarm64, raspberrypi3 Test dependencies: ------------------ * URI: git://git.openembedded.org/openembedded-core - branch: master - revision: 531f87111d83430615f2e20dd41a3dd5fc25c7ab * URI: git://git.openembedded.org/meta-openembedded - layers: meta-oe - branch: master - revision: 6b55bede28261c38fb1da1474ca5c991ac414c93 * URI: git://git.yoctoproject.org/meta-intel - branch: master - revision: 1610818c25713c700f48c5428c151d0d02e4aa94 - manual change to conf/layer.conf to support wrynose Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
1 parent 4bf6335 commit 8a2ec20

9 files changed

Lines changed: 105 additions & 48 deletions

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ SRC_URI += "\
3333
file://0001-Fix-building-gpu_host_impl.cc-on-Linux.patch \
3434
${@ '' if rust_is_newer_than_190(d) else 'file://chromium-142-crabbyavif-rust18x.patch'} \
3535
file://fix-SYS_SECCOMP-redefinition.patch \
36+
file://use-adler2.patch \
3637
"
3738

3839
# ARM/AArch64-specific patches.
@@ -486,6 +487,21 @@ do_copy_clang_library () {
486487
mkdir -p "$native_arch_path"
487488
echo "Executing cp -r $(ls -d *) $native_arch_path"
488489
cp -r * "$native_arch_path"
490+
491+
if [ "${TARGET_ARCH}" != "${BUILD_ARCH}" ]; then
492+
export CHROMIUM_BUILD_TRIPLET="$(echo ${RUST_BUILD_SYS} | sed 's:-oe-:-unknown-:')"
493+
cd "${STAGING_LIBDIR_NATIVE}/clang"
494+
rm -rf "latest/lib/${CHROMIUM_BUILD_TRIPLET}"
495+
cp -ar latest/lib/linux "latest/lib/${CHROMIUM_BUILD_TRIPLET}"
496+
cd "latest/lib/${CHROMIUM_BUILD_TRIPLET}"
497+
498+
for file in *-"${BUILD_ARCH}".a *-"${BUILD_ARCH}hf".a; do
499+
if [ -f "$file" ]; then
500+
new_name=$(echo "$file" | sed -e "s/-${BUILD_ARCH}hf//" -e "s/-${BUILD_ARCH}//")
501+
mv "$file" "$new_name"
502+
fi
503+
done
504+
fi
489505
}
490506
addtask copy_clang_library after do_add_clang_latest before do_compile
491507

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_142.0.7444.175.bb renamed to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_144.0.7559.132.bb

File renamed without changes.

meta-chromium/recipes-browser/chromium/chromium-x11_142.0.7444.175.bb renamed to meta-chromium/recipes-browser/chromium/chromium-x11_144.0.7559.132.bb

File renamed without changes.

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

Lines changed: 27 additions & 7 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] = "b802c5ab6477b62c85347fab4277e43d19d099ad26293ac3d0773c76c485b9d8"
7+
SRC_URI[sha256sum] = "424d6c3118f757ab6748ab32a610e0cc026a738004646b07f842615f89252c3f"
88
S = "${UNPACKDIR}/chromium-${PV}"
99

1010
# GCC is not tested or officially supported upstream, and supporting it here
@@ -65,7 +65,7 @@ LIC_FILES_CHKSUM = "\
6565
file://${S}/base/third_party/cityhash/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
6666
file://${S}/base/third_party/cityhash_v103/COPYING;md5=f714c995c5bd9b175938acdd69226b60 \
6767
file://${S}/base/third_party/double_conversion/LICENSE;md5=1ea35644f0ec0d9767897115667e901f \
68-
file://${S}/base/third_party/nspr/LICENSE;md5=0806173dfb7e6d060074595e968fd02e \
68+
file://${S}/base/third_party/nspr/LICENSE;md5=2ea4b962ed751ec64d301855ef8eda48 \
6969
file://${S}/base/third_party/superfasthash/LICENSE;md5=c66981f8ad23c9f279a5b9e07385128c \
7070
file://${S}/base/third_party/symbolize/LICENSE;md5=17ae3b22fe8fa438966625593e2eea85 \
7171
file://${S}/base/third_party/xdg_user_dirs/LICENSE;md5=d998f250c491c329a8254dd1ca62c647 \
@@ -89,8 +89,8 @@ LIC_FILES_CHKSUM = "\
8989
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_auth_blockstore/LICENSE;md5=fff98c651a1ae8a04462a12f8ea1f7a4 \
9090
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_base/LICENSE;md5=4a37c94d22ef29d62102bef4fc7bd8b0 \
9191
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_basement/LICENSE;md5=4a37c94d22ef29d62102bef4fc7bd8b0 \
92-
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast/LICENSE;md5=57bc9b01373a90210affff003e590c19 \
93-
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast_framework/LICENSE;md5=6e5955fc74e2abf3e5ca0bcb3878f837 \
92+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast/LICENSE;md5=549dd3aa232ccab33930a09a63e4288a \
93+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast_framework/LICENSE;md5=a254bf8bd0f2c4e215d92aad0a0320e5 \
9494
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_clearcut/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
9595
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cloud_messaging/LICENSE;md5=fff98c651a1ae8a04462a12f8ea1f7a4 \
9696
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_fido/LICENSE;md5=0b31499076a79957f503e7861250586c \
@@ -103,6 +103,7 @@ LIC_FILES_CHKSUM = "\
103103
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_phenotype/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
104104
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_stats/LICENSE;md5=5c9317538bd492b4fd01eec9d6972640 \
105105
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_tasks/LICENSE;md5=4a37c94d22ef29d62102bef4fc7bd8b0 \
106+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_time/LICENSE;md5=19b33604679e356d0086fe75b7a0438c \
106107
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_vision/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
107108
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_vision_common/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \
108109
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_libraries_identity_googleid_googleid/LICENSE;md5=498e555b4ebef5399d944fb662c61913 \
@@ -130,6 +131,23 @@ LIC_FILES_CHKSUM = "\
130131
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_guava_guava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
131132
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_j2objc_j2objc_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
132133
file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
134+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_curtains_curtains/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
135+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
136+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
137+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android_utils/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
138+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
139+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_gc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
140+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
141+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
142+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android_androidx/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
143+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
144+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_plumber_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
145+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_plumber_android_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
146+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
147+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
148+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_graph/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
149+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_hprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
150+
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_log/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
133151
file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_okio_okio_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
134152
file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
135153
file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_binder/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -151,7 +169,6 @@ LIC_FILES_CHKSUM = "\
151169
file://${S}/third_party/android_deps/autorolled/committed/libs/org_jetbrains_kotlinx_kotlinx_serialization_json_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
152170
file://${S}/third_party/android_deps/autorolled/committed/libs/org_jspecify_jspecify/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
153171
file://${S}/third_party/android_deps/autorolled/committed/libs/org_reactivestreams_reactive_streams/LICENSE;md5=e58c24d18490515b4c3001f330261afc \
154-
file://${S}/third_party/android_deps/libs/com_android_support_support_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
155172
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
156173
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
157174
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -302,6 +319,7 @@ LIC_FILES_CHKSUM = "\
302319
file://${S}/third_party/androidx/committed/libs/androidx_startup_startup_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
303320
file://${S}/third_party/androidx/committed/libs/androidx_swiperefreshlayout_swiperefreshlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
304321
file://${S}/third_party/androidx/committed/libs/androidx_tracing_tracing_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
322+
file://${S}/third_party/androidx/committed/libs/androidx_tracing_tracing_ktx/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
305323
file://${S}/third_party/androidx/committed/libs/androidx_transition_transition/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
306324
file://${S}/third_party/androidx/committed/libs/androidx_tvprovider_tvprovider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
307325
file://${S}/third_party/androidx/committed/libs/androidx_vectordrawable_vectordrawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -312,6 +330,8 @@ LIC_FILES_CHKSUM = "\
312330
file://${S}/third_party/androidx/committed/libs/androidx_webkit_webkit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
313331
file://${S}/third_party/androidx/committed/libs/androidx_window_window/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
314332
file://${S}/third_party/androidx/committed/libs/androidx_window_window_core_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
333+
file://${S}/third_party/androidx/committed/libs/androidx_work_work_multiprocess/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
334+
file://${S}/third_party/androidx/committed/libs/androidx_work_work_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
315335
file://${S}/third_party/androidx/committed/libs/androidx_xr_arcore_arcore/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
316336
file://${S}/third_party/androidx/committed/libs/androidx_xr_runtime_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
317337
file://${S}/third_party/androidx/committed/libs/androidx_xr_runtime_runtime_manifest/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -455,7 +475,7 @@ LIC_FILES_CHKSUM = "\
455475
file://${S}/third_party/hunspell/COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \
456476
file://${S}/third_party/hyphenation-patterns/LICENSE;md5=23d9bd4878e6f3669ed39b2095b01c13 \
457477
file://${S}/third_party/iaccessible2/LICENSE;md5=43bbd0bfb581347ec10def720000a645 \
458-
file://${S}/third_party/icu/LICENSE;md5=08dc3852df8fffa807301902ad899ff8 \
478+
file://${S}/third_party/icu/LICENSE;md5=cf57d9459a2c5f88ecd83c75207cc5ff \
459479
file://${S}/third_party/ink/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
460480
file://${S}/third_party/ink_stroke_modeler/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
461481
file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \
@@ -551,7 +571,7 @@ LIC_FILES_CHKSUM = "\
551571
file://${S}/third_party/rjsmin/LICENSE;md5=34f8c1142fd6208a8be89399cb521df9 \
552572
file://${S}/third_party/rnnoise/COPYING;md5=1890bf89a18f8339491894a0b45428bf \
553573
file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
554-
file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=b96cd7885ca6a74ae8f020ddafaa9349 \
574+
file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=618c57b748c4025c1a34e47b197fe7c5 \
555575
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
556576
file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \
557577
file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=7a9495742f21b7624515e120b720cc65 \

meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ diff --git a/build/config/rust.gni b/build/config/rust.gni
3030
index bd18d13..e260576 100644
3131
--- a/build/config/rust.gni
3232
+++ b/build/config/rust.gni
33-
@@ -91,6 +91,11 @@
33+
@@ -93,6 +93,11 @@ declare_args() {
3434
# a platform. Mostly applicable to Windows, where new versions can handle ANSI
3535
# escape sequences but it's not reliable in general.
3636
force_rustc_color_output = false
@@ -42,7 +42,7 @@ index bd18d13..e260576 100644
4242
}
4343

4444
declare_args() {
45-
@@ -177,12 +182,19 @@
45+
@@ -184,12 +189,19 @@ if (enable_rust) {
4646
# other toolchains.
4747
rust_abi_target = ""
4848
if (is_linux || is_chromeos) {
@@ -65,7 +65,7 @@ index bd18d13..e260576 100644
6565
} else if (current_cpu == "arm") {
6666
if (arm_float_abi == "hard") {
6767
float_suffix = "hf"
68-
@@ -200,25 +212,21 @@
68+
@@ -207,25 +219,21 @@ if (is_linux || is_chromeos) {
6969
# The thumbv7 vs. armv7 distinction is for legacy reasons and both
7070
# targets in fact target Thumb, see:
7171
# https://github.com/rust-lang/rust/issues/44722
@@ -101,7 +101,7 @@ diff --git a/build/rust/filter_clang_args.py b/build/rust/filter_clang_args.py
101101
index 5a1843c..7fb4b49 100644
102102
--- a/build/rust/gni_impl/filter_clang_args.py
103103
+++ b/build/rust/gni_impl/filter_clang_args.py
104-
@@ -25,6 +25,11 @@
104+
@@ -25,6 +25,11 @@ def filter_clang_args(clangargs):
105105
pass
106106
elif args[i].startswith('-plugin-arg'):
107107
i += 2
@@ -117,19 +117,19 @@ diff --git a/build/rust/gni_impl/rustc_wrapper.py b/build/rust/gni_impl/rustc_wr
117117
index 8f2096d..de43d44 100755
118118
--- a/build/rust/gni_impl/rustc_wrapper.py
119119
+++ b/build/rust/gni_impl/rustc_wrapper.py
120-
@@ -160,6 +160,7 @@ def main():
120+
@@ -204,6 +204,7 @@ def main():
121121
rustc_args = remaining_args[:ldflags_separator]
122122
ldflags = remaining_args[ldflags_separator + 1:rustenv_separator]
123123
rustenv = remaining_args[rustenv_separator + 1:sources_separator]
124124
+ rustenv += ["RUSTC_BOOTSTRAP=1"]
125-
125+
126126
abs_build_root = os.getcwd().replace('\\', '/') + '/'
127127
is_windows = sys.platform == 'win32' or args.target_windows
128128
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
129129
index bb2c988..fdddf68 100644
130130
--- a/build/rust/std/BUILD.gn
131131
+++ b/build/rust/std/BUILD.gn
132-
@@ -167,7 +167,8 @@
132+
@@ -171,7 +171,8 @@ if (toolchain_has_rust) {
133133
# our locally-built std. Both reside in root_out_dir: we must only have one of
134134
# each per GN toolchain anyway.
135135

@@ -139,7 +139,7 @@ index bb2c988..fdddf68 100644
139139

140140
if (!rust_prebuilt_stdlib) {
141141
local_rustc_sysroot = "$root_out_dir/local_rustc_sysroot"
142-
@@ -294,12 +295,12 @@
142+
@@ -298,12 +299,12 @@ if (toolchain_has_rust) {
143143
rust_abi_target,
144144
]
145145

@@ -155,7 +155,7 @@ index bb2c988..fdddf68 100644
155155
}
156156

157157
visibility = [ ":*" ]
158-
@@ -312,8 +313,18 @@
158+
@@ -316,8 +317,18 @@ if (toolchain_has_rust) {
159159
"enable_rust=false")
160160
deps = [ ":find_stdlib" ]
161161
sources = get_target_outputs(":find_stdlib")
@@ -176,7 +176,7 @@ index bb2c988..fdddf68 100644
176176

177177
visibility = [ ":*" ]
178178
}
179-
@@ -353,7 +364,10 @@
179+
@@ -357,7 +368,10 @@ if (toolchain_has_rust) {
180180
":prebuilt_stdlib_libs",
181181
":stdlib_public_dependent_libs",
182182
]
@@ -194,58 +194,58 @@ index 386258f..e8fdaa9 100755
194194
+++ b/build/rust/std/find_std_rlibs.py
195195
@@ -17,7 +17,7 @@ import re
196196
from collections import defaultdict
197-
197+
198198
EXPECTED_STDLIB_INPUT_REGEX = re.compile(r"([0-9a-z_]+)(?:-([0-9]+))?$")
199199
-RLIB_NAME_REGEX = re.compile(r"lib([0-9a-z_]+)-([0-9a-f]+)\.rlib$")
200200
+RLIB_NAME_REGEX = re.compile(r"lib([0-9a-z_]+)(-([0-9a-f]+))?\.rlib$")
201-
202-
201+
202+
203203
def main():
204-
@@ -52,6 +52,8 @@ def main():
205-
rustc_args.extend(["--target", args.target])
204+
@@ -53,6 +53,8 @@ def main():
206205
rustlib_dir = subprocess.check_output(rustc_args).rstrip().decode()
207-
206+
rustlib_dir = os.path.relpath(rustlib_dir)
207+
208208
+ lib_output_dir = os.path.join(args.output, 'lib')
209209
+
210210
# Copy the rlibs to a predictable location. Whilst we're doing so,
211211
# also write a .d file so that ninja knows it doesn't need to do this
212212
# again unless the source rlibs change.
213-
@@ -63,7 +65,7 @@ def main():
213+
@@ -64,7 +66,7 @@ def main():
214214
# output rlibs for that purpose. If any of the input rlibs change, ninja
215215
# will run this script again and we'll copy them all afresh.
216216
depfile.write(
217217
- "%s:" % (os.path.join(args.output, "lib%s.rlib" % args.depfile_target)))
218218
+ "%s:" % (os.path.join(lib_output_dir, "lib%s.rlib" % args.depfile_target)))
219-
219+
220220
def copy_file(infile, outfile):
221221
depfile.write(f" {infile}")
222-
@@ -99,7 +101,7 @@ def main():
222+
@@ -100,7 +102,7 @@ def main():
223223
# the correct file path to our linker invocations, we don't need
224224
# that, and it would prevent us having the predictable filenames
225225
# which we need for statically computable gn dependency rules.
226226
- (crate_name, metadata) = RLIB_NAME_REGEX.match(f).group(1, 2)
227227
+ (crate_name, metadata) = RLIB_NAME_REGEX.match(f).group(1, 3)
228-
228+
229229
# Use the number of times we've seen this name to disambiguate the output
230230
# filenames. Since we sort the input filenames including the metadata,
231-
@@ -117,14 +119,18 @@ def main():
231+
@@ -118,14 +120,18 @@ def main():
232232
output_filename = f"lib{concise_name}.rlib"
233-
233+
234234
infile = os.path.join(rustlib_dir, f)
235235
- outfile = os.path.join(args.output, output_filename)
236236
+ outfile = os.path.join(lib_output_dir, output_filename)
237237
copy_file(infile, outfile)
238-
238+
239239
for f in extra_libs:
240240
infile = os.path.join(rustlib_dir, f)
241241
- outfile = os.path.join(args.output, f)
242242
+ outfile = os.path.join(lib_output_dir, f)
243243
copy_file(infile, outfile)
244-
244+
245245
+ infile = os.path.join(os.environ['RUST_TARGET_PATH'], f'{args.target}.json')
246246
+ outfile = os.path.join(args.output, 'target.json')
247247
+ copy_file(infile, outfile)
248248
+
249249
depfile.write("\n")
250-
251-
250+
251+

0 commit comments

Comments
 (0)