Update to 97.0.4692.71-1

.build_config

@@ -10,7 +10,7 @@ trichrome_webview_target=trichrome_webview_apk
 trichrome_webview_64_target=trichrome_webview_64_apk
 all=all
 
-chromium_version=96.0.4664.110
-ungoogled_chromium_version=96.0.4664.110
+chromium_version=97.0.4692.71
+ungoogled_chromium_version=97.0.4692.71
 ungoogled_chromium_revision=1
 ungoogled_chromium_android_revision=1

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 97.0.4692.71-1
+* Upstream update
+* 
 # 96.0.4664.110-1
 * Upstream update
 

android_flags.gn

@@ -5,7 +5,6 @@ android_ndk_major_version = 23
 android_sdk_build_tools_version="31.0.0"
 android_sdk_version="31"
 cc_wrapper="ccache"
-clang_base_path="/usr"
 dfmify_dev_ui=false
 disable_android_lint=true
 disable_autofill_assistant_dfm=true
@@ -21,4 +20,3 @@ proprietary_codecs=true
 rtc_build_examples=false
 target_os="android"
 use_gnome_keyring=false
-use_sysroot=false

build.sh

@@ -186,16 +186,16 @@ function prepare_repos {
   pushd src/buildtools/linux64
   ln -s /usr/bin/clang-format
   popd
-  mkdir -p src/third_party/llvm-build/Release+Asserts/bin
-  pushd src/third_party/llvm-build/Release+Asserts/bin
-  ln -s /usr/bin/llvm-symbolizer
-  popd
 
   ## Hooks
   python src/build/util/lastchange.py -o src/build/util/LASTCHANGE
   python src/tools/download_optimization_profile.py --newest_state=src/chrome/android/profiles/newest.txt --local_state=src/chrome/android/profiles/local.txt --output_name=src/chrome/android/profiles/afdo.prof --gs_url_base=chromeos-prebuilt/afdo-job/llvm || return $?
   python src/build/util/lastchange.py -m GPU_LISTS_VERSION --revision-id-only --header src/gpu/config/gpu_lists_version.h
   python src/build/util/lastchange.py -m SKIA_COMMIT_HASH -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
+  # Prebuilt toolchains. There are certain Android-specific files not included in common linux distributions.
+  python src/tools/clang/scripts/update.py
+  python src/build/linux/sysroot_scripts/install-sysroot.py --arch=i386
+  python src/build/linux/sysroot_scripts/install-sysroot.py --arch=amd64
   patch_applied=true
   # Needed for an ad-block list ised in webview
   # gsutils still needs python2. Avoid it.

patches/Bromite/AImageReader-CFI-crash-mitigations.patch

@@ -79,7 +79,7 @@ See discussions at:
    AndroidImageReader();
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -2064,7 +2064,7 @@
+@@ -2097,7 +2097,7 @@
    {
      "name": "enable-image-reader",
      "owners": [ "vikassoni", "liberato" ],
@@ -115,7 +115,7 @@ See discussions at:
        "description": "DXVA video decoder crashes on some AMD GPUs.",
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -51,6 +51,11 @@ bool IsDeviceBlocked(const char* field,
+@@ -52,6 +52,11 @@ bool IsDeviceBlocked(const char* field,
  }  // namespace
 
  #if defined(OS_ANDROID)
@@ -149,7 +149,7 @@ See discussions at:
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
 
-@@ -344,6 +347,11 @@ void AdjustGpuFeatureStatusToWorkarounds
+@@ -356,6 +359,11 @@ void AdjustGpuFeatureStatusToWorkarounds
      gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
          kGpuFeatureStatusBlocklisted;
    }
@@ -214,7 +214,7 @@ See discussions at:
  }
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -667,6 +667,10 @@ const base::Feature kMediaDrmPreprovisio
+@@ -682,6 +682,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
-@@ -219,6 +219,7 @@ MEDIA_EXPORT extern const base::Feature
+@@ -216,6 +216,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;

patches/Bromite/Add-a-proxy-configuration-page.patch

@@ -67,7 +67,7 @@ for SimpleURLLoaders as well.
          android:title="@string/clear_browsing_data_title"
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -60,6 +60,7 @@ public class PrivacySettings
+@@ -59,6 +59,7 @@ public class PrivacySettings
      private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
      private static final String PREF_PRIVACY_REVIEW = "privacy_review";
      private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
@@ -77,7 +77,7 @@ for SimpleURLLoaders as well.
 
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -373,6 +373,8 @@ ChromeAutocompleteProviderClient::GetBui
+@@ -279,6 +279,8 @@ ChromeAutocompleteProviderClient::GetBui
        base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
  #endif
    builtins_to_provide.push_back(
@@ -165,7 +165,7 @@ for SimpleURLLoaders as well.
  #endif  // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -163,6 +163,8 @@
+@@ -159,6 +159,8 @@
  #include "printing/buildflags/buildflags.h"
  #include "rlz/buildflags/buildflags.h"
 
@@ -174,7 +174,7 @@ for SimpleURLLoaders as well.
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/background_mode_manager.h"
  #endif
-@@ -957,6 +959,8 @@ void RegisterLocalState(PrefRegistrySimp
+@@ -978,6 +980,8 @@ void RegisterLocalState(PrefRegistrySimp
    PluginsResourceService::RegisterPrefs(registry);
  #endif
 
@@ -630,7 +630,7 @@ for SimpleURLLoaders as well.
  #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
  #include "chrome/browser/ui/webui/signin_internals_ui.h"
  #include "chrome/browser/ui/webui/support_tool_ui.h"
-@@ -647,6 +648,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
+@@ -650,6 +651,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
      return &NewWebUI<MemoryInternalsUI>;
    if (url.host_piece() == chrome::kChromeUINetExportHost)
      return &NewWebUI<NetExportUI>;
@@ -1116,7 +1116,7 @@ for SimpleURLLoaders as well.
      kChromeUIOobeHost,
      kChromeUIOSCreditsHost,
      kChromeUIOSSettingsHost,
-@@ -584,6 +587,7 @@ const char* const kChromeHostURLs[] = {
+@@ -582,6 +585,7 @@ const char* const kChromeHostURLs[] = {
  #if !defined(OS_ANDROID)
  #if !BUILDFLAG(IS_CHROMEOS_ASH)
      kChromeUIAppLauncherPageHost,
@@ -1126,7 +1126,7 @@ for SimpleURLLoaders as well.
      kChromeUIDownloadsHost,
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -127,6 +127,8 @@ extern const char kChromeUIMemoryInterna
+@@ -125,6 +125,8 @@ extern const char kChromeUIMemoryInterna
  extern const char kChromeUINTPTilesInternalsHost[];
  extern const char kChromeUINaClHost[];
  extern const char kChromeUINetExportHost[];

patches/Bromite/Add-an-always-incognito-mode.patch

@@ -147,7 +147,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
  import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
  import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout;
-@@ -1779,8 +1780,9 @@ public class ChromeTabbedActivity extend
+@@ -1769,8 +1770,9 @@ public class ChromeTabbedActivity extend
          Bundle savedInstanceState = getSavedInstanceState();
 
          // We determine the model as soon as possible so every systems get initialized coherently.
@@ -169,7 +169,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
  import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
  import org.chromium.chrome.browser.device.DeviceClassManager;
-@@ -1966,6 +1967,9 @@ public abstract class ChromeActivity<C e
+@@ -1985,6 +1986,9 @@ public abstract class ChromeActivity<C e
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -181,7 +181,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
 
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -538,6 +538,12 @@ public class AppMenuPropertiesDelegateIm
+@@ -515,6 +515,12 @@ public class AppMenuPropertiesDelegateIm
      }
 
      private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
@@ -289,7 +289,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
      @Nullable
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
-@@ -34,6 +34,9 @@ import org.chromium.content_public.brows
+@@ -38,6 +38,9 @@ import org.chromium.network.mojom.Referr
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.url.GURL;
 
@@ -299,7 +299,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
  /**
   * This class attempts to preload the tab if the url is known from the intent when the profile
   * is created. This is done to improve startup latency.
-@@ -185,17 +188,22 @@ public class StartupTabPreloader impleme
+@@ -349,17 +352,22 @@ public class StartupTabPreloader impleme
          Intent intent = mIntentSupplier.get();
          GURL url = UrlFormatter.fixupUrl(getUrlFromIntent(intent));
 
@@ -327,7 +327,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
                         .setWebContents(webContents)
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -32,6 +32,10 @@ import org.chromium.chrome.browser.profi
+@@ -31,6 +31,10 @@ import org.chromium.chrome.browser.profi
  import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
  import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
  import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
@@ -338,7 +338,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
  import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
  import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
  import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
-@@ -49,7 +53,12 @@ import org.chromium.ui.text.SpanApplier;
+@@ -48,7 +52,12 @@ import org.chromium.ui.text.SpanApplier;
   * Fragment to keep track of the all the privacy related preferences.
   */
  public class PrivacySettings
@@ -352,7 +352,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
      private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
-@@ -94,6 +103,25 @@ public class PrivacySettings
+@@ -97,6 +106,25 @@ public class PrivacySettings
                  (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
          canMakePaymentPref.setOnPreferenceChangeListener(this);
 
@@ -378,7 +378,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
          ChromeSwitchPreference networkPredictionPref =
                  (ChromeSwitchPreference) findPreference(PREF_NETWORK_PREDICTIONS);
          networkPredictionPref.setChecked(
-@@ -182,6 +210,9 @@ public class PrivacySettings
+@@ -156,6 +184,9 @@ public class PrivacySettings
          } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
              PrivacyPreferencesManagerImpl.getInstance().setNetworkPredictionEnabled(
                      (boolean) newValue);
@@ -388,7 +388,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
          } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
              UserPrefs.get(Profile.getLastUsedRegularProfile())
                      .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue);
-@@ -285,4 +316,8 @@ public class PrivacySettings
+@@ -255,4 +286,8 @@ public class PrivacySettings
          }
          return false;
      }
@@ -563,7 +563,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
      }
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -455,7 +455,7 @@ const base::Feature kCCTIncognito{"CCTIn
+@@ -460,7 +460,7 @@ const base::Feature kCCTIncognito{"CCTIn
                                    base::FEATURE_ENABLED_BY_DEFAULT};
 
  const base::Feature kCCTIncognitoAvailableToThirdParty{
@@ -574,7 +574,7 @@ Enable incognito custom tabs and fix crashes for incognito/custom tab intents (c
                                         base::FEATURE_ENABLED_BY_DEFAULT};
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -948,6 +948,19 @@ Your Google account may have other forms
+@@ -954,6 +954,19 @@ Your Google account may have other forms
        <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED_NO_LINK" desc="A text for the basic tab explaining browsing history for users with history sync. This version is shown when the link to MyActivity is displayed separately.">
          Clears history from all synced devices.
        </message>