Android: Create a new ANGLE APK package name for AGI

Use "org.chromium.angle.agi" for the specially-built ANGLE APK for Android Graphics Inspector (AGI). This will allow AGI to work with a version of ANGLE that is built for it regardless of what other version(s) of ANGLE are or aren't installed on the device. Continue to use "org.chromium.angle" for developer builds. Bug: b/168745566 Change-Id: I4610d3b1eec6b0564d020dca7bd1f9e9d6532a64 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2684920Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Ian Elliott <ianelliott@google.com>

Android: Create a new ANGLE APK package name for AGI
7ec4d2d7 · Ian Elliott · Commit Bot · 45a493ea · 7ec4d2d7
Commit 7ec4d2d7 authored Feb 09, 2021 by Ian Elliott Committed by Commit Bot Feb 11, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 8 deletions

BUILD.gn BUILD.gn +19 -8

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1231,22 +1231,33 @@ if (!is_component_build && is_android && symbol_level != 0) {

 if (build_with_chromium && !is_component_build && is_android &&
    current_toolchain == default_toolchain) {
-  # Package ANGLE libraries
+  apk_version_code = "0"
+  if (angle_enable_commit_id) {
+    apk_version_code =
+        exec_script("src/commit_id.py", [ "position" ], "trim string")
+  }
+
+  # Package ANGLE libraries for normal use on Android
  angle_apk("angle_chromium_apk") {
    package_name = "org.chromium.angle"
    apk_name = "AngleLibraries"
    version_name = "ANGLE Developer Build"
+    version_code = apk_version_code
+  }

-    if (angle_enable_commit_id) {
-      version_code =
-          exec_script("src/commit_id.py", [ "position" ], "trim string")
-    } else {
-      version_code = "0"
-    }
+  # Package ANGLE libraries for AGI use on Android
+  angle_apk("angle_agi_chromium_apk") {
+    package_name = "org.chromium.angle.agi"
+    apk_name = "AngleAgiLibraries"
+    version_name = "ANGLE AGI Build"
+    version_code = apk_version_code
  }

  group("angle_apks") {
-    deps = [ ":angle_chromium_apk" ]
+    deps = [
+      ":angle_agi_chromium_apk",
+      ":angle_chromium_apk",
+    ]
  }
 }