BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 23 insertions, 3 deletions

diff --git a/chromium/chrome/android/trichrome.gni b/chromium/chrome/android/trichrome.gni
index aff10998c5d..795d2190b9f 100644
--- a/chromium/chrome/android/trichrome.gni
+++ b/chromium/chrome/android/trichrome.gni
@@ -44,11 +44,10 @@ template("trichrome_library_apk_tmpl") {
                              "android_manifest",
                              "android_manifest_dep",
                              "apk_name",
+                             "expected_android_manifest",
+                             "expected_libs_and_assets",
                              "min_sdk_version",
-                             "proguard_jar_path",
                              "target_sdk_version",
-                             "verify_manifest",
-                             "verify_native_libs_and_assets",
                            ])
 
     # TODO(torne): since there's no real java code in the library right now,
@@ -206,3 +205,24 @@ template("trichrome_library_apk_tmpl") {
     deps += [ "//chrome/android:trichrome_dummy_resources" ]
   }
 }
+
+# An .ssargs file is a text file to specify multiple input files with respective
+# parameters, and is used by SuperSize-archive to create multi-container .size
+# files. This is used to support SuperSize on Trichrome.
+template("write_ssargs_trichrome") {
+  # Base names (i.e., no full path) are used because .ssargs files specifies
+  # files using paths relative to itself. It is expected for |ssargs_path| to
+  # be in the same directory as all Trichrome files whose sizes are measured
+  # by SuperSize.
+  ssargs_lines = [
+    "# Written by build target \"${target_name}.\"",
+    "Library -f ${invoker.trichrome_library_basename}",
+    "Chrome -f ${invoker.trichrome_chrome_basename}",
+
+    # WebView has no .so files. --java-only is needed to prevent SuperSize
+    # from failing.
+    "WebView -f ${invoker.trichrome_webview_basename} --java-only",
+  ]
+
+  write_file(invoker.ssargs_path, ssargs_lines)
+}