BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 15 insertions, 4 deletions

diff --git a/chromium/build/config/android/config.gni b/chromium/build/config/android/config.gni
index a560d2698a8..8838f279509 100644
--- a/chromium/build/config/android/config.gni
+++ b/chromium/build/config/android/config.gni
@@ -45,6 +45,10 @@ if (is_android || is_chromeos) {
     # repositories to support both public only and internal builds.
     enable_chrome_android_internal = has_chrome_android_internal
 
+    # The default to use for android:minSdkVersion for targets that do
+    # not explicitly set it.
+    default_min_sdk_version = 21
+
     # Android API level for 32 bits platforms
     android32_ndk_api_level = 16
 
@@ -68,9 +72,6 @@ if (is_android || is_chromeos) {
     }
   }
 
-  # Our build rules support only KitKat+.
-  default_min_sdk_version = 19
-
   if (!defined(default_android_ndk_root)) {
     default_android_ndk_root = "//third_party/android_ndk"
     default_android_ndk_version = "r20"
@@ -88,6 +89,11 @@ if (is_android || is_chromeos) {
     public_android_sdk = true
   }
 
+  # For use downstream when we are building with preview Android SDK
+  if (!defined(final_android_sdk)) {
+    final_android_sdk = public_android_sdk
+  }
+
   if (!defined(default_lint_android_sdk_root)) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing lint version.
@@ -209,6 +215,11 @@ if (is_android || is_chromeos) {
     # configured to use it.
     enable_proguard_obfuscation = true
 
+    # Controls whether |short_resource_paths| and |strip_resource_names| are
+    # respected. Useful when trying to analyze APKs using tools that do not
+    # support mapping these names.
+    enable_arsc_obfuscation = true
+
     # The target to use as the system WebView implementation.
     system_webview_apk_target = "//android_webview:system_webview_apk"
   }
@@ -236,7 +247,7 @@ if (is_android || is_chromeos) {
     enable_bazel_desugar = true
 
     # Enables Java library desugaring.
-    # This will cause an extra 1MB classes.dex file to appear in every apk.
+    # This will cause an extra classes.dex file to appear in every apk.
     enable_jdk_library_desugaring = false
   }