diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index 40173d651..30478d1bb 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -33,6 +33,7 @@ SRC_URI += "\ file://0001-Fix-building-gpu_host_impl.cc-on-Linux.patch \ ${@ '' if rust_is_newer_than_190(d) else 'file://chromium-142-crabbyavif-rust18x.patch'} \ file://fix-SYS_SECCOMP-redefinition.patch \ + file://use-adler2.patch \ " # ARM/AArch64-specific patches. @@ -486,6 +487,21 @@ do_copy_clang_library () { mkdir -p "$native_arch_path" echo "Executing cp -r $(ls -d *) $native_arch_path" cp -r * "$native_arch_path" + + if [ "${TARGET_ARCH}" != "${BUILD_ARCH}" ]; then + export CHROMIUM_BUILD_TRIPLET="$(echo ${RUST_BUILD_SYS} | sed 's:-oe-:-unknown-:')" + cd "${STAGING_LIBDIR_NATIVE}/clang" + rm -rf "latest/lib/${CHROMIUM_BUILD_TRIPLET}" + cp -ar latest/lib/linux "latest/lib/${CHROMIUM_BUILD_TRIPLET}" + cd "latest/lib/${CHROMIUM_BUILD_TRIPLET}" + + for file in *-"${BUILD_ARCH}".a *-"${BUILD_ARCH}hf".a; do + if [ -f "$file" ]; then + new_name=$(echo "$file" | sed -e "s/-${BUILD_ARCH}hf//" -e "s/-${BUILD_ARCH}//") + mv "$file" "$new_name" + fi + done + fi } addtask copy_clang_library after do_add_clang_latest before do_compile diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_142.0.7444.175.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_144.0.7559.132.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_142.0.7444.175.bb rename to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_144.0.7559.132.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_142.0.7444.175.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_144.0.7559.132.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-x11_142.0.7444.175.bb rename to meta-chromium/recipes-browser/chromium/chromium-x11_144.0.7559.132.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index e8d3492d9..f940028ee 100644 --- a/meta-chromium/recipes-browser/chromium/chromium.inc +++ b/meta-chromium/recipes-browser/chromium/chromium.inc @@ -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] = "b802c5ab6477b62c85347fab4277e43d19d099ad26293ac3d0773c76c485b9d8" +SRC_URI[sha256sum] = "424d6c3118f757ab6748ab32a610e0cc026a738004646b07f842615f89252c3f" S = "${UNPACKDIR}/chromium-${PV}" # GCC is not tested or officially supported upstream, and supporting it here @@ -65,7 +65,7 @@ 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/nspr/LICENSE;md5=0806173dfb7e6d060074595e968fd02e \ + file://${S}/base/third_party/nspr/LICENSE;md5=2ea4b962ed751ec64d301855ef8eda48 \ file://${S}/base/third_party/superfasthash/LICENSE;md5=c66981f8ad23c9f279a5b9e07385128c \ file://${S}/base/third_party/symbolize/LICENSE;md5=17ae3b22fe8fa438966625593e2eea85 \ file://${S}/base/third_party/xdg_user_dirs/LICENSE;md5=d998f250c491c329a8254dd1ca62c647 \ @@ -89,8 +89,8 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_auth_blockstore/LICENSE;md5=fff98c651a1ae8a04462a12f8ea1f7a4 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_base/LICENSE;md5=4a37c94d22ef29d62102bef4fc7bd8b0 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_basement/LICENSE;md5=4a37c94d22ef29d62102bef4fc7bd8b0 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast/LICENSE;md5=57bc9b01373a90210affff003e590c19 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast_framework/LICENSE;md5=6e5955fc74e2abf3e5ca0bcb3878f837 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast/LICENSE;md5=549dd3aa232ccab33930a09a63e4288a \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cast_framework/LICENSE;md5=a254bf8bd0f2c4e215d92aad0a0320e5 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_clearcut/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cloud_messaging/LICENSE;md5=fff98c651a1ae8a04462a12f8ea1f7a4 \ 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 = "\ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_phenotype/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_stats/LICENSE;md5=5c9317538bd492b4fd01eec9d6972640 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_tasks/LICENSE;md5=4a37c94d22ef29d62102bef4fc7bd8b0 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_time/LICENSE;md5=19b33604679e356d0086fe75b7a0438c \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_vision/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_vision_common/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \ 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 = "\ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_guava_guava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_j2objc_j2objc_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_curtains_curtains/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_android_utils/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_gc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android_androidx/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_leakcanary_object_watcher_android_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_plumber_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_plumber_android_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_graph/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_hprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_leakcanary_shark_log/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_squareup_okio_okio_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_binder/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -151,7 +169,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/autorolled/committed/libs/org_jetbrains_kotlinx_kotlinx_serialization_json_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/org_jspecify_jspecify/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/org_reactivestreams_reactive_streams/LICENSE;md5=e58c24d18490515b4c3001f330261afc \ - file://${S}/third_party/android_deps/libs/com_android_support_support_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -302,6 +319,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_startup_startup_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_swiperefreshlayout_swiperefreshlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_tracing_tracing_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_tracing_tracing_ktx/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_transition_transition/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_tvprovider_tvprovider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_vectordrawable_vectordrawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -312,6 +330,8 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_webkit_webkit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_window_window/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_window_window_core_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_work_work_multiprocess/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_work_work_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_xr_arcore_arcore/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_xr_runtime_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_xr_runtime_runtime_manifest/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -455,7 +475,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/hunspell/COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ file://${S}/third_party/hyphenation-patterns/LICENSE;md5=23d9bd4878e6f3669ed39b2095b01c13 \ file://${S}/third_party/iaccessible2/LICENSE;md5=43bbd0bfb581347ec10def720000a645 \ - file://${S}/third_party/icu/LICENSE;md5=08dc3852df8fffa807301902ad899ff8 \ + file://${S}/third_party/icu/LICENSE;md5=cf57d9459a2c5f88ecd83c75207cc5ff \ file://${S}/third_party/ink/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/ink_stroke_modeler/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \ @@ -551,7 +571,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/rjsmin/LICENSE;md5=34f8c1142fd6208a8be89399cb521df9 \ file://${S}/third_party/rnnoise/COPYING;md5=1890bf89a18f8339491894a0b45428bf \ file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=b96cd7885ca6a74ae8f020ddafaa9349 \ + file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=618c57b748c4025c1a34e47b197fe7c5 \ file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \ file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=7a9495742f21b7624515e120b720cc65 \ diff --git a/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch b/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch index 71b42e085..9590349dc 100644 --- a/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch +++ b/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch @@ -30,7 +30,7 @@ diff --git a/build/config/rust.gni b/build/config/rust.gni index bd18d13..e260576 100644 --- a/build/config/rust.gni +++ b/build/config/rust.gni -@@ -91,6 +91,11 @@ +@@ -93,6 +93,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 @@ -42,7 +42,7 @@ index bd18d13..e260576 100644 } declare_args() { -@@ -177,12 +182,19 @@ +@@ -184,12 +189,19 @@ if (enable_rust) { # other toolchains. rust_abi_target = "" if (is_linux || is_chromeos) { @@ -65,7 +65,7 @@ index bd18d13..e260576 100644 } else if (current_cpu == "arm") { if (arm_float_abi == "hard") { float_suffix = "hf" -@@ -200,25 +212,21 @@ +@@ -207,25 +219,21 @@ if (is_linux || is_chromeos) { # The thumbv7 vs. armv7 distinction is for legacy reasons and both # targets in fact target Thumb, see: # 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 index 5a1843c..7fb4b49 100644 --- a/build/rust/gni_impl/filter_clang_args.py +++ b/build/rust/gni_impl/filter_clang_args.py -@@ -25,6 +25,11 @@ +@@ -25,6 +25,11 @@ def filter_clang_args(clangargs): pass elif args[i].startswith('-plugin-arg'): i += 2 @@ -117,19 +117,19 @@ diff --git a/build/rust/gni_impl/rustc_wrapper.py b/build/rust/gni_impl/rustc_wr index 8f2096d..de43d44 100755 --- a/build/rust/gni_impl/rustc_wrapper.py +++ b/build/rust/gni_impl/rustc_wrapper.py -@@ -160,6 +160,7 @@ def main(): +@@ -204,6 +204,7 @@ def main(): rustc_args = remaining_args[:ldflags_separator] ldflags = remaining_args[ldflags_separator + 1:rustenv_separator] rustenv = remaining_args[rustenv_separator + 1:sources_separator] + rustenv += ["RUSTC_BOOTSTRAP=1"] - + 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 bb2c988..fdddf68 100644 --- a/build/rust/std/BUILD.gn +++ b/build/rust/std/BUILD.gn -@@ -167,7 +167,8 @@ +@@ -171,7 +171,8 @@ if (toolchain_has_rust) { # our locally-built std. Both reside in root_out_dir: we must only have one of # each per GN toolchain anyway. @@ -139,7 +139,7 @@ index bb2c988..fdddf68 100644 if (!rust_prebuilt_stdlib) { local_rustc_sysroot = "$root_out_dir/local_rustc_sysroot" -@@ -294,12 +295,12 @@ +@@ -298,12 +299,12 @@ if (toolchain_has_rust) { rust_abi_target, ] @@ -155,7 +155,7 @@ index bb2c988..fdddf68 100644 } visibility = [ ":*" ] -@@ -312,8 +313,18 @@ +@@ -316,8 +317,18 @@ if (toolchain_has_rust) { "enable_rust=false") deps = [ ":find_stdlib" ] sources = get_target_outputs(":find_stdlib") @@ -176,7 +176,7 @@ index bb2c988..fdddf68 100644 visibility = [ ":*" ] } -@@ -353,7 +364,10 @@ +@@ -357,7 +368,10 @@ if (toolchain_has_rust) { ":prebuilt_stdlib_libs", ":stdlib_public_dependent_libs", ] @@ -194,58 +194,58 @@ index 386258f..e8fdaa9 100755 +++ b/build/rust/std/find_std_rlibs.py @@ -17,7 +17,7 @@ import re from collections import defaultdict - + EXPECTED_STDLIB_INPUT_REGEX = re.compile(r"([0-9a-z_]+)(?:-([0-9]+))?$") -RLIB_NAME_REGEX = re.compile(r"lib([0-9a-z_]+)-([0-9a-f]+)\.rlib$") +RLIB_NAME_REGEX = re.compile(r"lib([0-9a-z_]+)(-([0-9a-f]+))?\.rlib$") - - + + def main(): -@@ -52,6 +52,8 @@ def main(): - rustc_args.extend(["--target", args.target]) +@@ -53,6 +53,8 @@ def main(): rustlib_dir = subprocess.check_output(rustc_args).rstrip().decode() - + rustlib_dir = os.path.relpath(rustlib_dir) + + lib_output_dir = os.path.join(args.output, 'lib') + # Copy the rlibs to a predictable location. Whilst we're doing so, # also write a .d file so that ninja knows it doesn't need to do this # again unless the source rlibs change. -@@ -63,7 +65,7 @@ def main(): +@@ -64,7 +66,7 @@ def main(): # output rlibs for that purpose. If any of the input rlibs change, ninja # will run this script again and we'll copy them all afresh. depfile.write( - "%s:" % (os.path.join(args.output, "lib%s.rlib" % args.depfile_target))) + "%s:" % (os.path.join(lib_output_dir, "lib%s.rlib" % args.depfile_target))) - + def copy_file(infile, outfile): depfile.write(f" {infile}") -@@ -99,7 +101,7 @@ def main(): +@@ -100,7 +102,7 @@ def main(): # the correct file path to our linker invocations, we don't need # that, and it would prevent us having the predictable filenames # which we need for statically computable gn dependency rules. - (crate_name, metadata) = RLIB_NAME_REGEX.match(f).group(1, 2) + (crate_name, metadata) = RLIB_NAME_REGEX.match(f).group(1, 3) - + # Use the number of times we've seen this name to disambiguate the output # filenames. Since we sort the input filenames including the metadata, -@@ -117,14 +119,18 @@ def main(): +@@ -118,14 +120,18 @@ def main(): output_filename = f"lib{concise_name}.rlib" - + infile = os.path.join(rustlib_dir, f) - outfile = os.path.join(args.output, output_filename) + outfile = os.path.join(lib_output_dir, output_filename) copy_file(infile, outfile) - + for f in extra_libs: infile = os.path.join(rustlib_dir, f) - outfile = os.path.join(args.output, f) + outfile = os.path.join(lib_output_dir, f) copy_file(infile, outfile) - + + infile = os.path.join(os.environ['RUST_TARGET_PATH'], f'{args.target}.json') + outfile = os.path.join(args.output, 'target.json') + copy_file(infile, outfile) + depfile.write("\n") - - + + diff --git a/meta-chromium/recipes-browser/chromium/files/0013-Reduce-minimum-browser-window-width-to-480px.patch b/meta-chromium/recipes-browser/chromium/files/0013-Reduce-minimum-browser-window-width-to-480px.patch index 3426ed9b6..98dfa76b5 100644 --- a/meta-chromium/recipes-browser/chromium/files/0013-Reduce-minimum-browser-window-width-to-480px.patch +++ b/meta-chromium/recipes-browser/chromium/files/0013-Reduce-minimum-browser-window-width-to-480px.patch @@ -16,19 +16,19 @@ in progress. Upstream-Status: Pending Signed-off-by: Marek Vasut --- - chrome/browser/ui/views/frame/browser_view_layout.h | 2 +- + chrome/browser/ui/views/frame/layout/browser_view_layout.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h +diff --git a/chrome/browser/ui/views/frame/layout/browser_view_layout.h b/chrome/browser/ui/views/frame/layout/browser_view_layout.h index 493d444..99621d9 100644 ---- a/chrome/browser/ui/views/frame/browser_view_layout.h -+++ b/chrome/browser/ui/views/frame/browser_view_layout.h -@@ -44,7 +44,7 @@ class BrowserViewLayout : public views::LayoutManager { +--- a/chrome/browser/ui/views/frame/layout/browser_view_layout.h ++++ b/chrome/browser/ui/views/frame/layout/browser_view_layout.h +@@ -95,7 +95,7 @@ // very small window, even on large monitors (which is why a minimum height is // not specified). This value is used for the main browser window only, not // for popups. - static constexpr int kMainBrowserContentsMinimumWidth = 500; + static constexpr int kMainBrowserContentsMinimumWidth = 480; - - // |browser_view| may be null in tests. - BrowserViewLayout(std::unique_ptr delegate, + + // The width of the vertical tab strip. + // diff --git a/meta-chromium/recipes-browser/chromium/files/chromium-142-crabbyavif-rust18x.patch b/meta-chromium/recipes-browser/chromium/files/chromium-142-crabbyavif-rust18x.patch index 4e14ed965..7715365a4 100644 --- a/meta-chromium/recipes-browser/chromium/files/chromium-142-crabbyavif-rust18x.patch +++ b/meta-chromium/recipes-browser/chromium/files/chromium-142-crabbyavif-rust18x.patch @@ -6,7 +6,7 @@ diff --git a/third_party/crabbyavif/BUILD.gn b/third_party/crabbyavif/BUILD.gn index 38b2055f5c..c9ef690b78 100644 --- a/third_party/crabbyavif/BUILD.gn +++ b/third_party/crabbyavif/BUILD.gn -@@ -202,7 +202,7 @@ rust_static_library("crabbyavif") { +@@ -204,7 +204,7 @@ rust_static_library("crabbyavif") { # Required for disable_cfi feature. configs -= [ "//build/config/compiler:disallow_unstable_features" ] @@ -38,9 +38,9 @@ index 90fa411889..a05f0a5e8b 100644 #![deny(unsafe_op_in_unsafe_fn)] -#![cfg_attr(feature = "disable_cfi", feature(sanitize))] +#![cfg_attr(feature = "disable_cfi", feature(no_sanitize))] - - #[macro_use] - mod internal_utils; + // Clippy flags this as a false positive for some of the uses in this library. Disable this clippy + // warning. + #![allow(clippy::cast_slice_from_raw_parts)] diff --git a/third_party/crabbyavif/src/src/reformat/libyuv.rs b/third_party/crabbyavif/src/src/reformat/libyuv.rs index 9df874ccf7..3f68c16f2b 100644 --- a/third_party/crabbyavif/src/src/reformat/libyuv.rs diff --git a/meta-chromium/recipes-browser/chromium/files/use-adler2.patch b/meta-chromium/recipes-browser/chromium/files/use-adler2.patch new file mode 100644 index 000000000..f5b5d5c54 --- /dev/null +++ b/meta-chromium/recipes-browser/chromium/files/use-adler2.patch @@ -0,0 +1,18 @@ +Signed-off-by: Zoltán Böszörményi +Upstream-Status: Inappropriate [oe specific] + +--- a/build/rust/std/BUILD.gn 2026-03-16 07:25:22.000000000 +0100 ++++ b/build/rust/std/BUILD.gn 2026-03-16 07:34:45.265759526 +0100 +@@ -55,11 +55,7 @@ + "miniz_oxide", + "object", + ] +- if (rustc_nightly_capability) { +- stdlib_files += [ "adler2" ] +- } else { +- stdlib_files += [ "adler" ] +- } ++ stdlib_files += [ "adler2" ] + } + + if (toolchain_for_rust_host_build_tools) { diff --git a/meta-chromium/recipes-browser/chromium/generate_license_list.py b/meta-chromium/recipes-browser/chromium/generate_license_list.py index 811d14069..8f6e0a690 100755 --- a/meta-chromium/recipes-browser/chromium/generate_license_list.py +++ b/meta-chromium/recipes-browser/chromium/generate_license_list.py @@ -93,10 +93,13 @@ def print_license_list(chromium_root, output_file): suitable for use in a Yocto recipe.""" licenses = {} for license_file in find_chromium_licenses(chromium_root): - with open(license_file, 'rb') as file_handle: + # Only consider relative files + if license_file.startswith('/'): + continue + license_path = os.path.join(chromium_root, license_file) + with open(license_path, 'rb') as file_handle: license_hash = hashlib.md5(file_handle.read()).hexdigest() - license_relpath = os.path.relpath(license_file, chromium_root) - licenses[license_relpath] = license_hash + licenses[license_file] = license_hash with open(output_file, 'w') as out: out.write('LIC_FILES_CHKSUM = "\\\n') for f in sorted(licenses):