Android: Add <static-library> tag to trichrome library system stub apk

It seems as though this tag is needed in the stubs.

Bug: 1408164
Change-Id: I9d573a888470dd8734e2f70eff1993def511071b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4181485
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1094614}

build/android/gyp/create_stub_manifest.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Generates AndroidManifest.xml for a -Stub.apk."""
+
+import argparse
+import pathlib
+
+_MAIN_TEMPLATE = """\
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="will.be.replaced"
+    android:versionCode="1"
+    android:versionName="1.0">
+  <application android:label="APK Stub">{}</application>
+</manifest>
+"""
+
+_STATIC_LIBRARY_TEMPLATE = """
+    <static-library android:name="{}" android:version="1" />
+"""
+
+
+def main():
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--static-library-name')
+  parser.add_argument('--output', required=True)
+  args = parser.parse_args()
+
+  static_library_part = ''
+  if args.static_library_name:
+    static_library_part = _STATIC_LIBRARY_TEMPLATE.format(
+        args.static_library_name)
+
+  data = _MAIN_TEMPLATE.format(static_library_part)
+  pathlib.Path(args.output).write_text(data, encoding='utf8')
+
+
+if __name__ == '__main__':
+  main()

build/config/android/system_image.gni

@@ -9,6 +9,7 @@ import("//build/config/android/rules.gni")
 # Variables:
 #   package_name: Package name to use for the stub.
 #   package_name_from_target: Use the package name from this apk/bundle target.
+#   static_library_name: For static library apks, name for the <static-library>.
 #   stub_output: Path to output stub apk (default: do not create a stub).
 #
 # package_name and package_name_from_target are mutually exclusive.
@@ -19,8 +20,25 @@ template("system_image_stub_apk") {
 
   _resource_apk_path = "${target_out_dir}/$target_name.ap_"
   _resource_apk_target_name = "${target_name}__compile_resources"
+
+  _manifest_target_name = "${target_name}__manifest"
+  _manifest_path = "$target_gen_dir/$_manifest_target_name.xml"
+  action("$_manifest_target_name") {
+    outputs = [ _manifest_path ]
+    script = "//build/android/gyp/create_stub_manifest.py"
+    args = [
+      "--output",
+      rebase_path(_manifest_path, root_build_dir),
+    ]
+    if (defined(invoker.static_library_name)) {
+      args += [
+        "--static-library-name",
+        invoker.static_library_name,
+      ]
+    }
+  }
+
   action_with_pydeps(_resource_apk_target_name) {
-    _manifest_path = "//build/android/AndroidManifest.xml"
     script = "//build/android/gyp/compile_resources.py"
     inputs = [
       _manifest_path,
@@ -37,11 +55,12 @@ template("system_image_stub_apk") {
       "--arsc-path",
       rebase_path(_resource_apk_path, root_build_dir),
     ]
+    deps = [ ":$_manifest_target_name" ]
     if (defined(invoker.package_name)) {
       _package_name = invoker.package_name
     } else {
       _target = invoker.package_name_from_target
-      deps = [ "${_target}$build_config_target_suffix" ]
+      deps += [ "${_target}$build_config_target_suffix" ]
       _build_config = get_label_info(_target, "target_gen_dir") + "/" +
                       get_label_info(_target, "name") + ".build_config.json"
       inputs += [ _build_config ]
@@ -76,6 +95,7 @@ template("system_image_stub_apk") {
 # Variables:
 #   apk_or_bundle_target: Target that creates input bundle or apk.
 #   input_apk_or_bundle: Path to input .apk or .aab.
+#   static_library_name: For static library apks, name for the <static-library>.
 #   output: Path to the output system .apk or .zip.
 #   fuse_apk: Fuse all apk splits into a single .apk (default: false).
 #   stub_output: Path to output stub apk (default: do not create a stub).
@@ -84,6 +104,7 @@ template("system_image_apks") {
   if (defined(invoker.stub_output)) {
     _stub_apk_target_name = "${target_name}__stub"
     system_image_stub_apk(_stub_apk_target_name) {
+      forward_variables_from(invoker, [ "static_library_name" ])
       package_name_from_target = invoker.apk_or_bundle_target
       stub_output = invoker.stub_output
     }

chrome/android/BUILD.gn

@@ -2886,8 +2886,9 @@ if (current_toolchain == default_toolchain) {
 
     # Can be used to install compressed apks on system images.
     system_image_stub_apk("trichrome_library_system_stub_apk") {
-      package_name = chrome_public_manifest_package
+      package_name = trichrome_library_package
       stub_output = "$root_out_dir/apks/TrichromeLibrary-Stub.apk"
+      static_library_name = trichrome_library_package
     }
   }