Update/port to 119.0.6045.134

GrapheneOS · Nov 8, 2023 · 4ec44ca · 4ec44ca
1 parent ef1b990
commit 4ec44ca
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 92 deletions.
diff --git a/args.gn b/args.gn
@@ -3,8 +3,8 @@ target_os = "android"
 target_cpu = "arm64"
 
 android_channel = "stable"
-android_default_version_name = "119.0.6045.66"
-android_default_version_code = "604506600"
+android_default_version_name = "119.0.6045.134"
+android_default_version_code = "604513400"
 
 ext_version_enabled = true
 ext_version_increment = "0"

diff --git a/patches/0001-disable-checkout_nacl.patch b/patches/0001-disable-checkout_nacl.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index 6d0098b01ea02..1b5ecb747f234 100644
+index a432dcaebaa98..5c7c89857325b 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -119,7 +119,7 @@ vars = {

diff --git a/patches/0007-Vanadium-branding.patch b/patches/0007-Vanadium-branding.patch
@@ -49,7 +49,7 @@ Current incantation of the recolor command:
  create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index f56c41b506f45..b0721898be7d7 100644
+index 37e98fdbd1da9..430adba0a5d4c 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -150,24 +150,24 @@ if (current_toolchain == default_toolchain) {
@@ -95,7 +95,7 @@ index f56c41b506f45..b0721898be7d7 100644
      ]
    }
 
-@@ -2133,24 +2133,24 @@ if (current_toolchain == default_toolchain) {
+@@ -2134,24 +2134,24 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_base_module_resources") {
      resource_overlay = true
      sources = [

diff --git a/patches/0009-Vanadium-string-rebranding.patch b/patches/0009-Vanadium-string-rebranding.patch
diff --git a/patches/0039-disable-media-DRM-preprovisioning-by-default.patch b/patches/0039-disable-media-DRM-preprovisioning-by-default.patch
@@ -10,10 +10,10 @@ support is enabled.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
-index 44f58fe28d8d9..43b55db8a6228 100644
+index 6f2ba34b578d9..492ecb7213da2 100644
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -1136,7 +1136,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
+@@ -1141,7 +1141,7 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
  // which will trigger provisioning process after MediaDrmBridge is created.
  BASE_FEATURE(kMediaDrmPreprovisioning,
               "MediaDrmPreprovisioning",

diff --git a/patches/0047-enable-strict-site-isolation-by-default-on-Android.patch b/patches/0047-enable-strict-site-isolation-by-default-on-Android.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] enable strict site isolation by default on Android
  2 files changed, 14 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 419e96b4fdc13..3a898698c54c8 100644
+index 32e2e14cdb2d9..38b694b028f2a 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -5066,16 +5066,6 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5083,16 +5083,6 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kMojoLinuxChannelSharedMemDescription,
       kOsCrOS | kOsLinux | kOsLacros | kOsAndroid,
       FEATURE_VALUE_TYPE(mojo::core::kMojoLinuxChannelSharedMem)},

diff --git a/patches/0068-add-trichrome-browser-apk-targets.patch b/patches/0068-add-trichrome-browser-apk-targets.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] add trichrome browser apk targets
  2 files changed, 37 insertions(+)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index b0721898be7d7..8c61a5bbfed8b 100644
+index 430adba0a5d4c..8728878809d86 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -2391,6 +2391,10 @@ if (current_toolchain == default_toolchain) {
+@@ -2392,6 +2392,10 @@ if (current_toolchain == default_toolchain) {
      is_trichrome = true
      is_bundle_module = true
    }
@@ -23,7 +23,7 @@ index b0721898be7d7..8c61a5bbfed8b 100644
 
    # Exists separately from chrome_public_base_module_java_for_test to allow
    # downstream to depend on test support packages without needing to depend on
-@@ -2738,6 +2742,37 @@ if (current_toolchain == default_toolchain) {
+@@ -2739,6 +2743,37 @@ if (current_toolchain == default_toolchain) {
        }
      }
    }

diff --git a/patches/0083-disable-fetching-optimization-guides-by-default.patch b/patches/0083-disable-fetching-optimization-guides-by-default.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] disable fetching optimization guides by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc
-index 143bae6a4ec4c..7bd868e18b0be 100644
+index 5ee342ba3a519..a636b619c3a0d 100644
 --- a/components/optimization_guide/core/optimization_guide_features.cc
 +++ b/components/optimization_guide/core/optimization_guide_features.cc
 @@ -155,7 +155,7 @@ BASE_FEATURE(kOptimizationHints,

diff --git a/patches/0098-Support-native-Android-autofill-at-browser.patch b/patches/0098-Support-native-Android-autofill-at-browser.patch
@@ -40,10 +40,10 @@ index 449fe65d0bdda..6f0cf1553b07e 100644
 
  autofill::PersonalDataManager* AwAutofillClient::GetPersonalDataManager() {
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 8c61a5bbfed8b..1e1779458c68d 100644
+index 8728878809d86..e6b1e938d9a5a 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -452,6 +452,7 @@ if (current_toolchain == default_toolchain) {
+@@ -453,6 +453,7 @@ if (current_toolchain == default_toolchain) {
        "//chrome/browser/xsurface:java",
        "//chrome/browser/xsurface_provider:dependency_provider_impl_java",
        "//chrome/browser/xsurface_provider:java",