Generate multiple Android APKs

AndroidManifest.xml → AndroidManifest.xml.jinja2

@@ -7,13 +7,13 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.angle">
+    package="{{manifest_package|default('com.android.angle')}}">
     <uses-sdk android:minSdkVersion="26"
               android:targetSdkVersion="28">
     </uses-sdk>
 
     <application android:label="Android System Angle"
-        android:icon="@com.google.android.angle:drawable/icon"
+        android:icon="@{{manifest_package|default('com.android.angle')}}:drawable/icon"
         android:extractNativeLibs="false"
         android:multiArch="true"
         android:hasCode="false">

BUILD.gn

@@ -11,6 +11,7 @@ import("gni/angle.gni")
 if (is_android) {
   # android/rules.gni can only be imported for Android targets
   import("//build/config/android/rules.gni")
+  import("android/angle_apk.gni")
 }
 
 declare_args() {
@@ -972,41 +973,27 @@ shared_library("libfeature_support${angle_libs_suffix}") {
 
 if (is_android) {
   # Package ANGLE libraries for pre-installed system image
-  android_assets("angle_apk_assets") {
-    disable_compression = true
-    sources = [
-      "src/feature_support_util/a4a_rules.json",
-    ]
+  angle_apk("aosp_apk") {
+    package_name = "com.android.angle"
+    apk_name = "AngleAosp"
   }
 
-  android_resources("angle_apk_resources") {
-    resource_dirs = [ "android/res" ]
-    custom_package = "com.google.android.angle"
+  angle_apk("google_apk") {
+    package_name = "com.google.android.angle"
+    apk_name = "ANGLEPrebuilt"
   }
 
-  android_apk("angle_apk") {
+  group("angle_apks") {
     deps = [
-      ":angle_apk_assets",
-      ":angle_apk_resources",
+      ":aosp_apk",
+      ":google_apk",
     ]
-    if (build_apk_secondary_abi && android_64bit_target_cpu) {
-      secondary_abi_shared_libraries = [
-        "//third_party/angle:libEGL${angle_libs_suffix}($android_secondary_abi_toolchain)",
-        "//third_party/angle:libGLESv1_CM${angle_libs_suffix}($android_secondary_abi_toolchain)",
-        "//third_party/angle:libGLESv2${angle_libs_suffix}($android_secondary_abi_toolchain)",
-        "//third_party/angle:libfeature_support${angle_libs_suffix}($android_secondary_abi_toolchain)",
-      ]
-    }
-
-    android_manifest = "AndroidManifest.xml"
+  }
 
-    apk_name = "ANGLEPrebuilt"
-    uncompress_shared_libraries = true
-    shared_libraries = [
-      "//third_party/angle:libEGL${angle_libs_suffix}",
-      "//third_party/angle:libGLESv1_CM${angle_libs_suffix}",
-      "//third_party/angle:libGLESv2${angle_libs_suffix}",
-      "//third_party/angle:libfeature_support${angle_libs_suffix}",
+  # Include a temporary target until we update builders to use angle_apks
+  group("angle_apk") {
+    deps = [
+      ":angle_apks",
     ]
   }
 }

android/angle_apk.gni

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+import("//third_party/angle/gni/angle.gni")
+
+template("angle_apk") {
+  manifest_target_name = "${target_name}__manifest"
+  manifest_path = "${target_gen_dir}/${target_name}/AndroidManifest.xml"
+
+  jinja_template(manifest_target_name) {
+    input = "//third_party/angle/AndroidManifest.xml.jinja2"
+    output = manifest_path
+    variables = [ "manifest_package=${invoker.package_name}" ]
+  }
+
+  android_resources("${invoker.package_name}_resources") {
+    resource_dirs = [ "android/res" ]
+    custom_package = "${invoker.package_name}"
+  }
+
+  android_assets("${invoker.package_name}_assets") {
+    disable_compression = true
+    sources = [
+      "src/feature_support_util/a4a_rules.json",
+    ]
+  }
+
+  android_apk(target_name) {
+    forward_variables_from(invoker, "*")
+    android_manifest = manifest_path
+    android_manifest_dep = ":$manifest_target_name"
+    deps = [
+      ":${invoker.package_name}_assets",
+      ":${invoker.package_name}_resources",
+    ]
+
+    uncompress_shared_libraries = true
+
+    if (build_apk_secondary_abi && android_64bit_target_cpu) {
+      secondary_abi_shared_libraries = [
+        "//third_party/angle:libEGL${angle_libs_suffix}($android_secondary_abi_toolchain)",
+        "//third_party/angle:libGLESv1_CM${angle_libs_suffix}($android_secondary_abi_toolchain)",
+        "//third_party/angle:libGLESv2${angle_libs_suffix}($android_secondary_abi_toolchain)",
+        "//third_party/angle:libfeature_support${angle_libs_suffix}" +
+            "($android_secondary_abi_toolchain)",
+      ]
+    }
+
+    shared_libraries = [
+      "//third_party/angle:libEGL${angle_libs_suffix}",
+      "//third_party/angle:libGLESv1_CM${angle_libs_suffix}",
+      "//third_party/angle:libGLESv2${angle_libs_suffix}",
+      "//third_party/angle:libfeature_support${angle_libs_suffix}",
+    ]
+  }
+}