From 0d6a76147780f8253e33a261b17ce8c2e0a602a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= Date: Sat, 18 Jul 2026 07:38:56 +0200 Subject: [PATCH 1/2] chromium: Upgrade to 150.0.7871.186 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release notes: 150.0.7871.128: https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_049796704.html 150.0.7871.181: https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_0256605430.html 150.0.7871.186: https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_01320465736.html Build and patch changes: ------------------------ Added patches: * 0014-add-missing-logging-header.patch It fixes the build for use-v4l2 See https://github.com/OSSystems/meta-browser/issues/1003 Patch taken as is from https://github.com/OSSystems/meta-browser/pull/1015#issuecomment-5026644146 Removed patches: None Modified patches: None License changes: ---------------- None Test-built: ----------- * chromium-ozone-wayland * MACHINE=intel-corei7-64, qemuarm64, raspberrypi3 * chromium-x11 * MACHINE=intel-corei7-64, qemuarm64, raspberrypi3 Test dependencies: ------------------ * URI: git://git.openembedded.org/openembedded-core - branch: wrynose - revision: b5a6cada82d7ffb362bda9081c354dcc0b6ee264 * URI: git://git.openembedded.org/meta-openembedded - layers: meta-oe - branch: wrynose - revision: d97b5602d7f64422c94b7311466cda7f6b1962d5 * URI: git://git.yoctoproject.org/meta-intel - branch: wrynose - revision: 79a9681ce83f6bf36aede3aeb8c1707d29bca329 * URI: https://github.com/agherzan/meta-raspberrypi - branch: wrynose - revision: f62c67921474370829d24a4fa01ef88543f3906b Signed-off-by: Zoltán Böszörményi --- ...b => chromium-gn-native_150.0.7871.186.bb} | 0 .../recipes-browser/chromium/chromium-gn.inc | 1 + ... chromium-ozone-wayland_150.0.7871.186.bb} | 0 ....124.bb => chromium-x11_150.0.7871.186.bb} | 0 .../recipes-browser/chromium/chromium.inc | 2 +- .../0014-add-missing-logging-header.patch | 26 +++++++++++++++++++ 6 files changed, 28 insertions(+), 1 deletion(-) rename meta-chromium/recipes-browser/chromium/{chromium-gn-native_150.0.7871.124.bb => chromium-gn-native_150.0.7871.186.bb} (100%) rename meta-chromium/recipes-browser/chromium/{chromium-ozone-wayland_150.0.7871.124.bb => chromium-ozone-wayland_150.0.7871.186.bb} (100%) rename meta-chromium/recipes-browser/chromium/{chromium-x11_150.0.7871.124.bb => chromium-x11_150.0.7871.186.bb} (100%) create mode 100644 meta-chromium/recipes-browser/chromium/files/0014-add-missing-logging-header.patch diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn-native_150.0.7871.124.bb b/meta-chromium/recipes-browser/chromium/chromium-gn-native_150.0.7871.186.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-gn-native_150.0.7871.124.bb rename to meta-chromium/recipes-browser/chromium/chromium-gn-native_150.0.7871.186.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index c8f5df04e..e3edbd35b 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -38,6 +38,7 @@ SRC_URI += "\ file://Backport-151-Only-pass-sysroot-if-use_sysroot.patch \ file://Backport-151-build-Omit-ar-from-inputs-when-resolved-via-PATH.patch \ file://Backport-151-build-Fix-get_path_info-on-empty-ar-in-unbundle-tool.patch \ + file://0014-add-missing-logging-header.patch \ " # ARM/AArch64-specific patches. diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_150.0.7871.124.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_150.0.7871.186.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_150.0.7871.124.bb rename to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_150.0.7871.186.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_150.0.7871.124.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_150.0.7871.186.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-x11_150.0.7871.124.bb rename to meta-chromium/recipes-browser/chromium/chromium-x11_150.0.7871.186.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index eaca8ff4c..2d43a19cd 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] = "e58003703f48e3c18687ac80e45095c1377687c1671bd3cefca3868d9495a3ef" +SRC_URI[sha256sum] = "aea4fe88390bc7296c1be9db958cdcacd8ab7bc5a1f69eb691cc9e34a1444790" S = "${UNPACKDIR}/chromium-${PV}" # GCC is not tested or officially supported upstream, and supporting it here diff --git a/meta-chromium/recipes-browser/chromium/files/0014-add-missing-logging-header.patch b/meta-chromium/recipes-browser/chromium/files/0014-add-missing-logging-header.patch new file mode 100644 index 000000000..8a9ae884e --- /dev/null +++ b/meta-chromium/recipes-browser/chromium/files/0014-add-missing-logging-header.patch @@ -0,0 +1,26 @@ +From 47cfc23814e8abb38635c0d4fab1e721030030cd Mon Sep 17 00:00:00 2001 +From: Thorsten Lannynd +Date: Mon, 20 Jul 2026 14:12:51 -0500 +Subject: [PATCH] add missing logging header + +Upstream-Status: Pending +Signed-off-by: Thorsten Lannynd +--- + media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc b/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc +index 58a9b95e81..6b26e3e4a9 100644 +--- a/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc ++++ b/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc +@@ -7,6 +7,7 @@ + #include + #include + ++#include "base/logging.h" + #include "base/process/process_metrics.h" + #include "base/strings/stringprintf.h" + #include "build/build_config.h" +-- +2.34.1 + From fc1d4401286fb1f5186163c72a21e88eb726179b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= Date: Sun, 2 Aug 2026 08:33:49 +0200 Subject: [PATCH 2/2] chromium: Upgrade to 151.0.7922.173 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release notes: 151.0.7922.71: https://chromereleases.googleblog.com/2026/07/stable-channel-update-for-desktop_0887107924.html 151.0.7922.75: https://chromereleases.googleblog.com/2026/08/stable-channel-update-for-desktop.html 151.0.7922.108: https://chromereleases.googleblog.com/2026/08/stable-channel-update-for-desktop_01193673229.html 151.0.7922.137: https://chromereleases.googleblog.com/2026/08/stable-channel-update-for-desktop_01815628406.html 151.0.7922.169: https://chromereleases.googleblog.com/2026/08/stable-channel-update-for-desktop_0826575033.html 151.0.7922.173: https://chromereleases.googleblog.com/2026/08/stable-channel-update-for-desktop_0404570826.html Build and patch changes: ------------------------ Added patches: * Backport-152-don-t-depends-on-histograms.xml-if-it-is-not-git-che.patch It fixes the build error: | ERROR Unresolved dependencies. | //tools/metrics:metrics_metadata(//build/toolchain/yocto:yocto_target) | needs //tools/metrics:histograms_xml(//build/toolchain/yocto:yocto_target) Removed patches: * Backport-151-Only-pass-sysroot-if-use_sysroot.patch * Backport-151-build-Fix-get_path_info-on-empty-ar-in-unbundle-tool.patch * Backport-151-build-Omit-ar-from-inputs-when-resolved-via-PATH.patch These are in the current release. Modified patches: * 0004-Delete-compiler-options-not-available-in-release-ver.patch Adapted to the new version. License changes: ---------------- Added licenses: * third_party/androidx/committed/libs/androidx_pdf_pdf_core/LICENSE * third_party/androidx/third_party/ink/LICENSE * third_party/federated_compute/third_party/googleapis/src/LICENSE * third_party/federated_compute/third_party/protodatastore-cpp/src/LICENSE * third_party/federated_compute/third_party/tensorflow-federated/src/LICENSE * third_party/iamf_tools/src/LICENSE * third_party/rust/chromium_crates_io/vendor/font-types-v0_12/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/harfrust-v0_10/LICENSE * third_party/rust/chromium_crates_io/vendor/read-fonts-v0_40/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/ref-cast-impl-v1/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/ref-cast-v1/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/sfv-v0_15/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/skrifa-v0_43/LICENSE-APACHE Removed licenses: * third_party/android_deps/autorolled/committed/libs/com_google_android_annotations/LICENSE * third_party/android_deps/autorolled/committed/libs/com_google_code_gson_gson/LICENSE * third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_binder/LICENSE * third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_context/LICENSE * third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_core/LICENSE * third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_protobuf_lite/LICENSE * third_party/android_deps/autorolled/committed/libs/io_perfmark_perfmark_api/LICENSE * third_party/rust/chromium_crates_io/vendor/font-types-v0_11/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/harfrust-v0_8/LICENSE * third_party/rust/chromium_crates_io/vendor/hashbrown-v0_15/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/read-fonts-v0_39/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/skrifa-v0_42/LICENSE-APACHE * third_party/rust/chromium_crates_io/vendor/strum-v0_27/LICENSE * third_party/rust/chromium_crates_io/vendor/strum_macros-v0_27/LICENSE Updated licenses: * net/third_party/mozilla_security_manager/LICENSE * third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_cloud_messaging/LICENSE * third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_location/LICENSE * third_party/dawn/LICENSE * third_party/litert/LICENSE * third_party/rust/chromium_crates_io/vendor/shared-brotli-patch-decoder-v0_1/LICENSE-APACHE * third_party/screen-ai/THIRD_PARTY_LICENSES * third_party/tflite/LICENSE Test-built: ----------- * chromium-ozone-wayland * MACHINE=intel-corei7-64, qemuarm64, raspberrypi3 * chromium-x11 * MACHINE=intel-corei7-64, qemuarm64, raspberrypi3 Test dependencies: ------------------ * URI: git://git.openembedded.org/openembedded-core - branch: wrynose - revision: ef022bf82d79015802309d14c28b13373ebe53f5 * URI: git://git.openembedded.org/meta-openembedded - layers: meta-oe - branch: wrynose - revision: 6bf0d8ad57b33950bab4c7f6c037e1ccb6f6e2eb * URI: git://git.yoctoproject.org/meta-intel - branch: wrynose - revision: 79a9681ce83f6bf36aede3aeb8c1707d29bca329 * URI: https://github.com/agherzan/meta-raspberrypi - branch: wrynose - revision: f62c67921474370829d24a4fa01ef88543f3906b Signed-off-by: Zoltán Böszörményi --- ...b => chromium-gn-native_151.0.7922.173.bb} | 0 .../recipes-browser/chromium/chromium-gn.inc | 4 +- ... chromium-ozone-wayland_151.0.7922.173.bb} | 0 ....186.bb => chromium-x11_151.0.7922.173.bb} | 0 .../recipes-browser/chromium/chromium.inc | 45 ++++++++-------- ...options-not-available-in-release-ver.patch | 24 +++++---- ...151-Only-pass-sysroot-if-use_sysroot.patch | 36 ------------- ...th_info-on-empty-ar-in-unbundle-tool.patch | 41 --------------- ...r-from-inputs-when-resolved-via-PATH.patch | 52 ------------------- ...-histograms.xml-if-it-is-not-git-che.patch | 43 +++++++++++++++ 10 files changed, 79 insertions(+), 166 deletions(-) rename meta-chromium/recipes-browser/chromium/{chromium-gn-native_150.0.7871.186.bb => chromium-gn-native_151.0.7922.173.bb} (100%) rename meta-chromium/recipes-browser/chromium/{chromium-ozone-wayland_150.0.7871.186.bb => chromium-ozone-wayland_151.0.7922.173.bb} (100%) rename meta-chromium/recipes-browser/chromium/{chromium-x11_150.0.7871.186.bb => chromium-x11_151.0.7922.173.bb} (100%) delete mode 100644 meta-chromium/recipes-browser/chromium/files/Backport-151-Only-pass-sysroot-if-use_sysroot.patch delete mode 100644 meta-chromium/recipes-browser/chromium/files/Backport-151-build-Fix-get_path_info-on-empty-ar-in-unbundle-tool.patch delete mode 100644 meta-chromium/recipes-browser/chromium/files/Backport-151-build-Omit-ar-from-inputs-when-resolved-via-PATH.patch create mode 100644 meta-chromium/recipes-browser/chromium/files/Backport-152-don-t-depends-on-histograms.xml-if-it-is-not-git-che.patch diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn-native_150.0.7871.186.bb b/meta-chromium/recipes-browser/chromium/chromium-gn-native_151.0.7922.173.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-gn-native_150.0.7871.186.bb rename to meta-chromium/recipes-browser/chromium/chromium-gn-native_151.0.7922.173.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index e3edbd35b..f2fa5d9bf 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -35,10 +35,8 @@ SRC_URI += "\ file://fix-SYS_SECCOMP-redefinition.patch \ file://chromium-145-zip_ffi_glue-use-edition2024.patch \ file://disable-sanitizer.patch \ - file://Backport-151-Only-pass-sysroot-if-use_sysroot.patch \ - file://Backport-151-build-Omit-ar-from-inputs-when-resolved-via-PATH.patch \ - file://Backport-151-build-Fix-get_path_info-on-empty-ar-in-unbundle-tool.patch \ file://0014-add-missing-logging-header.patch \ + file://Backport-152-don-t-depends-on-histograms.xml-if-it-is-not-git-che.patch \ " # ARM/AArch64-specific patches. diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_150.0.7871.186.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_151.0.7922.173.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_150.0.7871.186.bb rename to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_151.0.7922.173.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_150.0.7871.186.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_151.0.7922.173.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-x11_150.0.7871.186.bb rename to meta-chromium/recipes-browser/chromium/chromium-x11_151.0.7922.173.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index 2d43a19cd..740cf550a 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] = "aea4fe88390bc7296c1be9db958cdcacd8ab7bc5a1f69eb691cc9e34a1444790" +SRC_URI[sha256sum] = "716e1b73f79911ac9a315642ebc989acd62c1cde366b11e7289f8500d4cd9120" S = "${UNPACKDIR}/chromium-${PV}" # GCC is not tested or officially supported upstream, and supporting it here @@ -73,13 +73,12 @@ LIC_FILES_CHKSUM = "\ file://${S}/chrome/browser/resources/chromeos/accessibility/chromevox/mv3/third_party/tamachiyomi/LICENSE;md5=15772cfcf7016e701ce54554516c0688 \ file://${S}/ios/third_party/blink/LICENSE;md5=9fdb47308c4e0a2b6d07c5af39e5da1a \ file://${S}/ios/third_party/lottie/LICENSE;md5=1e714768add1e7fdb1288bac703bad06 \ - file://${S}/net/third_party/mozilla_security_manager/LICENSE;md5=f19cdef64a433efe7fd2ddbfc3a19313 \ + file://${S}/net/third_party/mozilla_security_manager/LICENSE;md5=7369d6e77a1a8d11f036c179703e06ac \ file://${S}/net/third_party/mozilla_win/LICENSE;md5=9b13a17f35cae227ee726ee0108d72a2 \ file://${S}/net/third_party/quiche/src/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ file://${S}/net/third_party/uri_template/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/abseil-cpp/LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_airbnb_android_lottie/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_annotations/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_datatransport_transport_api/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_datatransport_transport_backend_cct/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_datatransport_transport_runtime/LICENSE;md5=54d2f6e66dae1f9e4dbf3cb3cc197631 \ @@ -92,14 +91,14 @@ LIC_FILES_CHKSUM = "\ 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_cloud_messaging/LICENSE;md5=4ba83c92e60cddf63c3b16ee12f70a30 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_fido/LICENSE;md5=41f683dc747475dd5240eb9e41e62714 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_flags/LICENSE;md5=5c9317538bd492b4fd01eec9d6972640 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_gcm/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_identity_credentials/LICENSE;md5=848796728ffbc490ef5ab42e20b7cb4f \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_iid/LICENSE;md5=05fc50851d6d550ef2bb400b326353f0 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_instantapps/LICENSE;md5=44b3e1cb996ad75b025cf78e53ba7d42 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_location/LICENSE;md5=18ad89b4a01838496ae844c2b9bd2a7f \ + file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_android_gms_play_services_location/LICENSE;md5=9622ddc8804b30c09b9a32bcc9eee9f3 \ 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=cc7f424ca274480751fb30b1c103cbff \ @@ -114,7 +113,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_ar_impress/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_auto_service_auto_service_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_code_findbugs_jsr305/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_code_gson_gson/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_errorprone_error_prone_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_firebase_firebase_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/com_google_firebase_firebase_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -154,12 +152,7 @@ LIC_FILES_CHKSUM = "\ 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 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_context/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_protobuf_lite/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/io_grpc_grpc_stub/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/autorolled/committed/libs/io_perfmark_perfmark_api/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ file://${S}/third_party/android_deps/autorolled/committed/libs/io_reactivex_rxjava2_rxandroid/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/io_reactivex_rxjava2_rxjava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/autorolled/committed/libs/javax_inject_javax_inject/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -312,6 +305,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_paging_paging_compose_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_paging_paging_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_palette_palette/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/committed/libs/androidx_pdf_pdf_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_pdf_pdf_document_service/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_pdf_pdf_ink/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_pdf_pdf_viewer/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -360,6 +354,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/androidx/committed/libs/androidx_xr_scenecore_scenecore_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_xr_scenecore_scenecore_spatial_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/androidx/committed/libs/androidx_xr_scenecore_scenecore_spatial_rendering/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/androidx/third_party/ink/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/angle/LICENSE;md5=7abdb66a6948f39c2f469140db5184e2 \ file://${S}/third_party/angle/src/common/third_party/xxhash/LICENSE;md5=13be6b481ff5616f77dda971191bb29b \ file://${S}/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/LICENSE;md5=100356b560682b0ae7739e09db42f319 \ @@ -435,7 +430,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/cros-components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/d3/src/LICENSE;md5=fcc83e5a00c3ea5885051b46163bd453 \ file://${S}/third_party/dav1d/LICENSE;md5=59cb7015cbeea4a8675b9bdb657d41b3 \ - file://${S}/third_party/dawn/LICENSE;md5=69558ae12e1997226758845b299ef47b \ + file://${S}/third_party/dawn/LICENSE;md5=4b027cb118b5201017d46569c7b61d5f \ file://${S}/third_party/dawn/third_party/EGL-Registry/LICENSE;md5=c90a5ee1efc70696e791af6526d10316 \ file://${S}/third_party/dawn/third_party/OpenGL-Registry/LICENSE;md5=4589b5370db12eac489ca4bc72424644 \ file://${S}/third_party/dawn/third_party/directx-shader-compiler/LICENSE;md5=54608d7a795b9cd13a6e6c352fb890e7 \ @@ -477,6 +472,9 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/fast_float/src/LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \ file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \ file://${S}/third_party/federated_compute/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/federated_compute/third_party/googleapis/src/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://${S}/third_party/federated_compute/third_party/protodatastore-cpp/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/federated_compute/third_party/tensorflow-federated/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=b7cbca23ed0604649b2111e6e9d21ea6 \ file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \ file://${S}/third_party/flac/COPYING.Xiph;md5=3d6da238b5b57a0965d6730291119f65 \ @@ -498,6 +496,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/iamf_tools/src/LICENSE;md5=b03893ffc2e5b1cc7b0a020fa2860689 \ file://${S}/third_party/icu/LICENSE;md5=e531a388be7c1df9a0fb7b4010c9c1d7 \ file://${S}/third_party/ink/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \ @@ -543,7 +542,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/libyuv/LICENSE;md5=464282cfb405b005b9637f11103a7325 \ file://${S}/third_party/libzip/LICENSE;md5=6bb2408fd544544b86946e67ec2da9a0 \ file://${S}/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \ - file://${S}/third_party/litert/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://${S}/third_party/litert/LICENSE;md5=9eb9d752d9ac8c81c1f220e72afaca15 \ file://${S}/third_party/llvm-libc/src/LICENSE.TXT;md5=ff42885ed2ab98f1ecb8c1fc41205343 \ file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \ file://${S}/third_party/lss/LICENSE;md5=31b650551268648966d774a3ecc710cf \ @@ -632,11 +631,10 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/rust/chromium_crates_io/vendor/fixed_decimal-v0_7/LICENSE;md5=9541a35d720222b4579e8c8fb11a95ef \ file://${S}/third_party/rust/chromium_crates_io/vendor/flate2-v1/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/foldhash-v0_2/LICENSE;md5=20ff5307d48c7c74b29bfe1add54da14 \ - file://${S}/third_party/rust/chromium_crates_io/vendor/font-types-v0_11/LICENSE-APACHE;md5=59172f861df4cf7ba24b91219b2d296c \ + file://${S}/third_party/rust/chromium_crates_io/vendor/font-types-v0_12/LICENSE-APACHE;md5=28fed82d6ae2accf02dbcfbd8afb1993 \ file://${S}/third_party/rust/chromium_crates_io/vendor/getrandom-v0_3/LICENSE-APACHE;md5=9ee8a33d3852b5a3d70f661d27bf3cc5 \ file://${S}/third_party/rust/chromium_crates_io/vendor/getrandom-v0_4/LICENSE-APACHE;md5=9ee8a33d3852b5a3d70f661d27bf3cc5 \ - file://${S}/third_party/rust/chromium_crates_io/vendor/harfrust-v0_8/LICENSE;md5=839a86944f5872e71795649dd1330f95 \ - file://${S}/third_party/rust/chromium_crates_io/vendor/hashbrown-v0_15/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ + file://${S}/third_party/rust/chromium_crates_io/vendor/harfrust-v0_10/LICENSE;md5=839a86944f5872e71795649dd1330f95 \ file://${S}/third_party/rust/chromium_crates_io/vendor/hashbrown-v0_17/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/heck-v0_5/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/hmac-sha256-v1/LICENSE;md5=0374227100dea4b8cc3cbe397dbfe5d2 \ @@ -704,7 +702,9 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/rust/chromium_crates_io/vendor/pxfm-v0_1/LICENSE-APACHE.md;md5=ab34104060d5d9778db84575862424d3 \ file://${S}/third_party/rust/chromium_crates_io/vendor/qr_code-v2/LICENSE-APACHE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/rust/chromium_crates_io/vendor/quote-v1/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ - file://${S}/third_party/rust/chromium_crates_io/vendor/read-fonts-v0_39/LICENSE-APACHE;md5=59172f861df4cf7ba24b91219b2d296c \ + file://${S}/third_party/rust/chromium_crates_io/vendor/read-fonts-v0_40/LICENSE-APACHE;md5=28fed82d6ae2accf02dbcfbd8afb1993 \ + file://${S}/third_party/rust/chromium_crates_io/vendor/ref-cast-impl-v1/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ + file://${S}/third_party/rust/chromium_crates_io/vendor/ref-cast-v1/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ file://${S}/third_party/rust/chromium_crates_io/vendor/regex-automata-v0_4/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/regex-lite-v0_1/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/regex-syntax-v0_8/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ @@ -718,17 +718,16 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/rust/chromium_crates_io/vendor/serde_derive-v1/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ file://${S}/third_party/rust/chromium_crates_io/vendor/serde_json-v1/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ file://${S}/third_party/rust/chromium_crates_io/vendor/serde_json_lenient-v0_2/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \ - file://${S}/third_party/rust/chromium_crates_io/vendor/shared-brotli-patch-decoder-v0_1/LICENSE-APACHE;md5=dbc2f71c38e5e44a9cef51bc6409331e \ + file://${S}/third_party/rust/chromium_crates_io/vendor/sfv-v0_15/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ + file://${S}/third_party/rust/chromium_crates_io/vendor/shared-brotli-patch-decoder-v0_1/LICENSE-APACHE;md5=28fed82d6ae2accf02dbcfbd8afb1993 \ file://${S}/third_party/rust/chromium_crates_io/vendor/simd-adler32-v0_3/LICENSE.md;md5=990e2165f17348c5171ea091dcd8231b \ - file://${S}/third_party/rust/chromium_crates_io/vendor/skrifa-v0_42/LICENSE-APACHE;md5=59172f861df4cf7ba24b91219b2d296c \ + file://${S}/third_party/rust/chromium_crates_io/vendor/skrifa-v0_43/LICENSE-APACHE;md5=28fed82d6ae2accf02dbcfbd8afb1993 \ file://${S}/third_party/rust/chromium_crates_io/vendor/smallvec-v1/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/stable_deref_trait-v1/LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \ file://${S}/third_party/rust/chromium_crates_io/vendor/static_assertions-v1/LICENSE-APACHE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/rust/chromium_crates_io/vendor/strck-v1/LICENSE;md5=eb5465956199ab06665c39173ce362f8 \ file://${S}/third_party/rust/chromium_crates_io/vendor/strength_reduce-v0_2/LICENSE-APACHE;md5=25d3e06178b11a7b123c10703ad7baaf \ - file://${S}/third_party/rust/chromium_crates_io/vendor/strum-v0_27/LICENSE;md5=b73288c747267992cc39afc7bde8af66 \ file://${S}/third_party/rust/chromium_crates_io/vendor/strum-v0_28/LICENSE;md5=b73288c747267992cc39afc7bde8af66 \ - file://${S}/third_party/rust/chromium_crates_io/vendor/strum_macros-v0_27/LICENSE;md5=b73288c747267992cc39afc7bde8af66 \ file://${S}/third_party/rust/chromium_crates_io/vendor/strum_macros-v0_28/LICENSE;md5=b73288c747267992cc39afc7bde8af66 \ file://${S}/third_party/rust/chromium_crates_io/vendor/subtle-v2/LICENSE;md5=cff47234d8cf608834b44ad9405e5493 \ file://${S}/third_party/rust/chromium_crates_io/vendor/symphonia-bundle-flac-v0_6/LICENSE;md5=280da0ae8b63b2e861e6766d710e9baf \ @@ -777,7 +776,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/rust/chromium_crates_io/vendor/zmij-v1/LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \ file://${S}/third_party/rust/chromium_crates_io/vendor/zoneinfo64-v0_3/LICENSE;md5=9541a35d720222b4579e8c8fb11a95ef \ file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=88bf91aa9c37f6d08921c4a13ea501c1 \ + file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=df116844bef026971d6d5115f5daa68c \ 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 \ @@ -801,7 +800,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/tensorflow-text/LICENSE;md5=01e86893010a1b87e69a213faa753ebd \ file://${S}/third_party/tensorflow_models/src/LICENSE;md5=6f798069926aa738ee3bbbcac6c62a2f \ file://${S}/third_party/text-fragments-polyfill/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://${S}/third_party/tflite/LICENSE;md5=64a34301f8e355f57ec992c2af3e5157 \ + file://${S}/third_party/tflite/LICENSE;md5=e6821b5adb546f4e3449d929d5f6ea77 \ file://${S}/third_party/tflite_support/LICENSE;md5=e03a906d141508f60cbe30013b8d064b \ file://${S}/third_party/ukey2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/unrar/src/license.txt;md5=fc9c335ec05a5f36764ef9ce7a79daa1 \ diff --git a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch index 5b6d7d7ff..e62debebb 100644 --- a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch +++ b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch @@ -29,28 +29,30 @@ Signed-off-by: Khem Raj Signed-off-by: Randy MacLeod Signed-off-by: Ariel D'Alessandro --- - build/config/compiler/BUILD.gn | 25 +++++-------------- + build/config/compiler/BUILD.gn | 27 +++++--------------- build/config/sanitizers/sanitizers.gni | 7 ------- - 2 files changed, 5 insertions(+), 27 deletions(-) + 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index c092446fa0..ce6d73d30c 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -588,12 +588,6 @@ +@@ -576,14 +576,6 @@ config("compiler") { if (is_clang) { # Flags for diagnostics. cflags += [ "-fcolor-diagnostics" ] -- if (!is_win) { -- cflags += [ "-fdiagnostics-show-inlining-chain" ] -- } else { -- # Combine after https://github.com/llvm/llvm-project/pull/192241 -- cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ] +- if (!is_wasm) { +- if (!is_win) { +- cflags += [ "-fdiagnostics-show-inlining-chain" ] +- } else { +- # Combine after https://github.com/llvm/llvm-project/pull/192241 +- cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ] +- } - } if (diagnostics_print_source_range_info && !is_win) { cflags += [ "-fdiagnostics-print-source-range-info" ] } -@@ -624,13 +624,6 @@ +@@ -614,13 +606,6 @@ config("compiler") { ] } @@ -64,7 +66,7 @@ index c092446fa0..ce6d73d30c 100644 # TODO(hans): Remove this once Clang generates better optimized debug info # by default. https://crbug.com/765793 cflags += [ -@@ -668,13 +661,6 @@ +@@ -658,13 +643,6 @@ config("compiler") { cflags += [ "-ffp-contract=off" ] } @@ -78,7 +80,7 @@ index c092446fa0..ce6d73d30c 100644 } # C11/C++11 compiler flags setup. -@@ -2196,6 +2182,11 @@ +@@ -1895,6 +1873,11 @@ config("default_warnings") { if (is_clang) { cflags += [ diff --git a/meta-chromium/recipes-browser/chromium/files/Backport-151-Only-pass-sysroot-if-use_sysroot.patch b/meta-chromium/recipes-browser/chromium/files/Backport-151-Only-pass-sysroot-if-use_sysroot.patch deleted file mode 100644 index adb8a0e13..000000000 --- a/meta-chromium/recipes-browser/chromium/files/Backport-151-Only-pass-sysroot-if-use_sysroot.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b93239da427a5019a9742d44e50e9996c1b04ea9 Mon Sep 17 00:00:00 2001 -From: Nathan Pratta Teodosio -Date: Fri, 19 Jun 2026 09:06:46 -0700 -Subject: [PATCH] Only pass sysroot if use_sysroot. - -Fixes the build when use_sysroot = false as then 'sysroot' variable is empty. - -Bug: None -Change-Id: I7fc7ba35f3ba416af0cbd8df94393dc901724b8b -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7927226 -Reviewed-by: Sylvain Defresne -Commit-Queue: Andrew Grieve -Reviewed-by: Andrew Grieve -Cr-Commit-Position: refs/heads/main@{#1649706} - -Upstream-Status: Backport ---- - build/modules/BUILD.gn | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/modules/BUILD.gn b/build/modules/BUILD.gn -index 02bfd462acd0f..3ef79fa7933c3 100644 ---- a/build/modules/BUILD.gn -+++ b/build/modules/BUILD.gn -@@ -223,7 +223,7 @@ - # otherwise. - "--append-module=std.new:export new_h\\nexport vcruntime_exception", - ] -- } else { -+ } else if (use_sysroot) { - # We need to pass the sysroot in so that it can scan it to generate a - # modulemap for the sysroot headers. - args += [ --- -2.54.0 - diff --git a/meta-chromium/recipes-browser/chromium/files/Backport-151-build-Fix-get_path_info-on-empty-ar-in-unbundle-tool.patch b/meta-chromium/recipes-browser/chromium/files/Backport-151-build-Fix-get_path_info-on-empty-ar-in-unbundle-tool.patch deleted file mode 100644 index 3b651cd5b..000000000 --- a/meta-chromium/recipes-browser/chromium/files/Backport-151-build-Fix-get_path_info-on-empty-ar-in-unbundle-tool.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7d6555b11f181bdc24ba56577f753a07add6e8c7 Mon Sep 17 00:00:00 2001 -From: Matt Jolly -Date: Tue, 16 Jun 2026 21:57:07 -0700 -Subject: [PATCH] build: Fix get_path_info on empty ar in unbundle toolchain - -Some toolchains leave ar empty during initial setup, causing GN to error -when get_path_info() is called with an empty string. Guard the check to -only run when ar is not empty. - -Signed-off-by: Matt Jolly -Change-Id: I87615806ddfda6f262a7500b0c5b6fed1f452985 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7949777 -Reviewed-by: Takuto Ikuta -Commit-Queue: Takuto Ikuta -Reviewed-by: Matt Stark -Cr-Commit-Position: refs/heads/main@{#1648076} - -Upstream-Status: Backport ---- - build/toolchain/gcc_toolchain.gni | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni -index ec66ab3f948b1..d8457bfa53a4e 100644 ---- a/build/toolchain/gcc_toolchain.gni -+++ b/build/toolchain/gcc_toolchain.gni -@@ -409,8 +409,9 @@ template("single_gcc_toolchain") { - } else { - command = "rm -f {{output}} && $command" - -- # Add ar to inputs if it's not from $PATH. -- if (get_path_info(ar, "file") != ar) { -+ # Add ar to inputs if it's not from $PATH. Some toolchains leave -+ # |ar| empty during toolchain setup, so guard get_path_info() here. -+ if (ar != "" && get_path_info(ar, "file") != ar) { - inputs = - [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ] - } --- -2.55.0 - diff --git a/meta-chromium/recipes-browser/chromium/files/Backport-151-build-Omit-ar-from-inputs-when-resolved-via-PATH.patch b/meta-chromium/recipes-browser/chromium/files/Backport-151-build-Omit-ar-from-inputs-when-resolved-via-PATH.patch deleted file mode 100644 index cb222d24c..000000000 --- a/meta-chromium/recipes-browser/chromium/files/Backport-151-build-Omit-ar-from-inputs-when-resolved-via-PATH.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 60f987d8d5f7272793a40290d060b8f50933f825 Mon Sep 17 00:00:00 2001 -From: Takuto Ikuta -Date: Mon, 8 Jun 2026 19:43:20 -0700 -Subject: [PATCH] build: Omit ar from inputs when resolved via $PATH - -The GN build configuration previously added the `ar` tool to the inputs -list unconditionally. However, if the `ar` tool is specified simply by -its filename and is resolved via the system `$PATH`, it should not be -tracked as a direct input dependency. - -This change adds a condition to verify if `ar` is an explicit path -rather than just a filename. It only includes `ar` in the action's -inputs list when it is not resolved from `$PATH`. - -This is to address -https://crrev.com/c/7835150/8/build/toolchain/gcc_toolchain.gni#406 - -Bug: 358521078 -Change-Id: I096ac4aa7f3b697c58c94af1349159b9c87f4201 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7904982 -Commit-Queue: Takuto Ikuta -Reviewed-by: Matt Stark -Auto-Submit: Takuto Ikuta -Cr-Commit-Position: refs/heads/main@{#1643634} - -Upstream-Status: Backport ---- - build/toolchain/gcc_toolchain.gni | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni -index 51433d488da07..ec66ab3f948b1 100644 ---- a/build/toolchain/gcc_toolchain.gni -+++ b/build/toolchain/gcc_toolchain.gni -@@ -408,8 +408,12 @@ template("single_gcc_toolchain") { - command = "cmd /s /c \"\"$python_path\" $tool_wrapper_path delete-file {{output}} && $command\"" - } else { - command = "rm -f {{output}} && $command" -- inputs = -- [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ] -+ -+ # Add ar to inputs if it's not from $PATH. -+ if (get_path_info(ar, "file") != ar) { -+ inputs = -+ [ get_path_info(rebase_path(ar, ".", root_out_dir), "abspath") ] -+ } - } - - # Almost all targets build with //build/config/compiler:thin_archive which --- -2.55.0 - diff --git a/meta-chromium/recipes-browser/chromium/files/Backport-152-don-t-depends-on-histograms.xml-if-it-is-not-git-che.patch b/meta-chromium/recipes-browser/chromium/files/Backport-152-don-t-depends-on-histograms.xml-if-it-is-not-git-che.patch new file mode 100644 index 000000000..7dc9cc957 --- /dev/null +++ b/meta-chromium/recipes-browser/chromium/files/Backport-152-don-t-depends-on-histograms.xml-if-it-is-not-git-che.patch @@ -0,0 +1,43 @@ +From 27f8690db999f6e56f0af7a9ea3d28a019ed72ca Mon Sep 17 00:00:00 2001 +From: Fumitoshi Ukai +Date: Tue, 30 Jun 2026 18:32:03 -0700 +Subject: [PATCH] don't depends on histograms.xml if it is not git checkout + +histograms.xml is only generated on git checkout. + +Bug: 329080012 +Change-Id: Iea4484f8af4cf9ef25e25ea1df2c616fbe46ed5c +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8019063 +Reviewed-by: Jesse McKenna +Commit-Queue: Fumitoshi Ukai +Auto-Submit: Fumitoshi Ukai +Cr-Commit-Position: refs/heads/main@{#1655184} +Upstream-Status: Backport +--- + tools/metrics/BUILD.gn | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tools/metrics/BUILD.gn b/tools/metrics/BUILD.gn +index c826e9708bf6a..23799c76dd7ef 100644 +--- a/tools/metrics/BUILD.gn ++++ b/tools/metrics/BUILD.gn +@@ -41,11 +41,11 @@ group("metrics_metadata") { + ] + + # Only include histograms_xml if we have access to dirmd data, which +- # is used to populate ownership information. This is only set to false +- # for non-git checkouts. +- # TODO(crbug.com/329080012): Remove this once dirmd works in non-git +- # checkouts. +- if (generate_location_tags) { ++ # is used to populate ownership information. This is disabled ++ # for non-git checkouts, as dirmd doesn't work on non-git checkout. ++ # TODO(crbug.com/329080012): Remove this condition once dirmd works ++ # in non-git checkouts. ++ if (path_exists("//.git")) { + deps += [ ":histograms_xml" ] + } + } +-- +2.55.0 +