Update to 96.0.4664.45-1

Author: wchen342

.build_config

@@ -10,7 +10,7 @@ trichrome_webview_target=trichrome_webview_apk
 trichrome_webview_64_target=trichrome_webview_64_apk
 all=all
 
-chromium_version=95.0.4638.74
-ungoogled_chromium_version=95.0.4638.69
+chromium_version=96.0.4664.45
+ungoogled_chromium_version=96.0.4664.45
 ungoogled_chromium_revision=1
 ungoogled_chromium_android_revision=1

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 96.0.4664.45-1
+* Re-enable bookmark import-export
+* Disable offline indicator
+* Add extra Vanadium enhancements:
+  * Enable user-agent freeze
+  * Enable split cache, partitioning connections, strict site isolation
+  * Other compiling time enhancements
+
 # 95.0.4638.74-1
 * Upstream update
 

README.md

@@ -37,12 +37,13 @@ In descending order of significance (i.e. most important objective first):
 
 *These are the differences between a Linux build of ungoogled-chromium and ungoogled-chromium-android.*
 
-* Disable Android specific functionalities:
-   * lite mode
-   * contextual search
-   * prefetch
-   * remove home page links
-   * remove unnecessary account permissions
+* Disable/Remove Android specific functionalities:
+   * Contextual search
+   * Lite mode
+   * Offline indicator
+   * Prefetch
+   * Home page links
+   * Unnecessary account permissions
 * Android specific enhancements:
    * Add `Startpage.com` and `Qwant.com` as search engine options
    * Add new folder button in bookmark manager
@@ -51,13 +52,22 @@ In descending order of significance (i.e. most important objective first):
    * Add flags to always send `save-data` flag in header
    * Add flags to force tablet UI and desktop mode
 * Borrowed from Bromite:
-   * Exit menu item
-   * flag to disable device orientation API
-   * option to clear open tabs between sessions
-   * prevent WebRTC address leaking
-   * enable DNS-over-Https by default
-   * Add bookmark import/export options
+   * Always incognito mode
+   * Bookmark import/export options
+   * Clear open tabs between sessions
    * Disable DRM media preprovisioning which leaks connections
+   * DNS-over-https by default
+   * Exit menu item
+   * Prevent WebRTC address leaking
+   * Proxy configuration
+   * WebGL flag
+* Borrowed from Vanadium:
+  * Disable seed-based field trials
+  * Disable media router
+  * Disable metrics
+  * Enable user-agent freeze
+  * Enable split cache, partitioning connections, strict site isolation
+  * Various compiling time enhancements
 * All Google play and Google service related blobs are removed. This includes Firebase, GCM (Google Cloud Messaging), GMS (Google Mobile Services) and bridge to Google Play. 
 * Releases are built for `arm`, `arm64` and `x86`. There is no `x86_64` build.
 

build.sh

@@ -243,7 +243,7 @@ popd
 # Some of the support libraries can be grabbed from maven https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/com/android/support/
 
 ## Prepare Android SDK/NDK
-SDK_NAME="android-sdk_eng.12.0.0_r2_linux-x86"
+SDK_NAME="android-sdk_user-12.0.0_r13_linux-x86"
 SDK_VERSION_CODE="12"
 
 # Create symbol links to sdk folders
@@ -276,7 +276,7 @@ popd
 mkdir android-sdk
 mkdir android-ndk
 pushd android-rebuilds
-unzip -qqo ${SDK_NAME}.zip -d ../android-sdk && mv ../android-sdk/android-sdk_eng.build_linux-x86 ../android-sdk/${SDK_NAME}  && rm -f ${SDK_NAME}.zip && s=0 || s=$? && (exit $s)
+unzip -qqo ${SDK_NAME}.zip -d ../android-sdk && rm -f ${SDK_NAME}.zip && s=0 || s=$? && (exit $s)
 unzip -qqo sdk-repo-linux-tools-26.1.1.zip -d ../android-sdk/${SDK_NAME} && rm -f sdk-repo-linux-tools-26.1.1.zip && s=0 || s=$? && (exit $s)
 unzip -qqo android-ndk-r23-linux-x86_64.zip -d ../android-ndk && rm -f android-ndk-r23-linux-x86_64.zip && s=0 || s=$? && (exit $s)
 popd

domain_sub_2.list

@@ -59,17 +59,17 @@ See discussions at:
  AndroidImageReader::AndroidImageReader() : is_supported_(LoadFunctions()) {}
 --- a/base/android/android_image_reader_compat.h
 +++ b/base/android/android_image_reader_compat.h
-@@ -22,6 +22,9 @@ class BASE_EXPORT AndroidImageReader {
-   // Thread safe GetInstance.
-   static AndroidImageReader& GetInstance();
+@@ -25,6 +25,9 @@ class BASE_EXPORT AndroidImageReader {
+   AndroidImageReader(const AndroidImageReader&) = delete;
+   AndroidImageReader& operator=(const AndroidImageReader&) = delete;
 
 +  // Disable image reader support.
 +  static void DisableSupport();
 +
    // Check if the image reader usage is supported. This function returns TRUE
    // if android version is >=OREO, image reader support is not disabled and all
    // the required functions are loaded.
-@@ -59,6 +62,7 @@ class BASE_EXPORT AndroidImageReader {
+@@ -62,6 +65,7 @@ class BASE_EXPORT AndroidImageReader {
    jobject ANativeWindow_toSurface(JNIEnv* env, ANativeWindow* window);
 
   private:
@@ -79,11 +79,11 @@ See discussions at:
    AndroidImageReader();
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -2101,7 +2101,7 @@
+@@ -2064,7 +2064,7 @@
    {
      "name": "enable-image-reader",
      "owners": [ "vikassoni", "liberato" ],
--    "expiry_milestone": 95
+-    "expiry_milestone": 115
 +    "expiry_milestone": -1
    },
    {
@@ -163,7 +163,7 @@ See discussions at:
  // Estimates roughly user total disk space by counting in the drives where
 --- a/gpu/config/gpu_workaround_list.txt
 +++ b/gpu/config/gpu_workaround_list.txt
-@@ -13,6 +13,7 @@ decode_encode_srgb_for_generatemipmap
+@@ -14,6 +14,7 @@ decode_encode_srgb_for_generatemipmap
  depth_stencil_renderbuffer_resize_emulation
  disable_2d_canvas_auto_flush
  disable_accelerated_av1_decode
@@ -173,7 +173,7 @@ See discussions at:
  disable_accelerated_vp8_decode
 --- a/gpu/ipc/service/gpu_init.cc
 +++ b/gpu/ipc/service/gpu_init.cc
-@@ -517,6 +517,11 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -521,6 +521,11 @@ bool GpuInit::InitializeAndStartSandbox(
      }
    }
 
@@ -195,7 +195,7 @@ See discussions at:
  #include "base/android/scoped_hardware_buffer_fence_sync.h"
  #include "base/bind.h"
  #include "base/feature_list.h"
-@@ -50,7 +51,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> M
+@@ -51,7 +52,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> M
  }
 
  TextureOwner::Mode GetTextureOwnerMode() {
@@ -214,7 +214,7 @@ See discussions at:
  }
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -657,6 +657,10 @@ const base::Feature kMediaDrmPreprovisio
+@@ -667,6 +667,10 @@ const base::Feature kMediaDrmPreprovisio
  // Note: Has no effect if kMediaDrmPreprovisioning feature is disabled.
  const base::Feature kMediaDrmPreprovisioningAtStartup{
      "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -227,7 +227,7 @@ See discussions at:
  const base::Feature kPictureInPictureAPI{"PictureInPictureAPI",
 --- a/media/base/media_switches.h
 +++ b/media/base/media_switches.h
-@@ -216,6 +216,7 @@ MEDIA_EXPORT extern const base::Feature
+@@ -219,6 +219,7 @@ MEDIA_EXPORT extern const base::Feature
  MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays;
  MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture;
  MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense;