Android: Clean up the ANGLE APK

BUILD.gn

@@ -1099,22 +1099,15 @@ if (!is_component_build && is_android && symbol_level != 0) {
 
 if (!is_component_build && is_android &&
     current_toolchain == default_toolchain) {
-  # Package ANGLE libraries for pre-installed system image
-  angle_apk("aosp_apk") {
-    package_name = "com.android.angle"
+  # Package ANGLE libraries
+  angle_apk("angle_chromium_apk") {
+    package_name = "com.chromium.angle"
     apk_name = "AngleLibraries"
   }
 
   group("angle_apks") {
     deps = [
-      ":aosp_apk",
-    ]
-  }
-
-  # Include a temporary target until we update builders to use angle_apks
-  group("angle_apk") {
-    deps = [
-      ":angle_apks",
+      ":angle_chromium_apk",
     ]
   }
 }

android/AndroidManifest.xml.jinja2

@@ -7,29 +7,14 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="{{manifest_package|default('com.android.angle')}}">
+          package="{{manifest_package|default('com.chromium.angle')}}">
 
     <uses-sdk android:minSdkVersion="26"
               android:targetSdkVersion="28">
     </uses-sdk>
 
-    <application android:label="Android System Angle"
-                 android:icon="@{{manifest_package|default('com.android.angle')}}:drawable/icon"
+    <application android:label="Angle for Android"
                  android:extractNativeLibs="false"
                  android:multiArch="true">
-
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.INFO"/>
-            </intent-filter>
-
-            <!-- Indicate that this PKG is ANGLE. -->
-            <intent-filter android:priority="1">
-                <action android:name="android.app.action.ANGLE_FOR_ANDROID" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
     </application>
 </manifest>

android/angle_apk.gni

@@ -30,11 +30,6 @@ template("angle_apk") {
     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 = [
@@ -48,7 +43,6 @@ template("angle_apk") {
     android_manifest_dep = ":$manifest_target_name"
     deps = [
       ":${invoker.package_name}_assets",
-      ":${invoker.package_name}_resources",
     ]
     if (symbol_level != 0) {
       deps += [ ":compressed_symbols" ]

android/src/com/android/angle/MainActivity.java

-/*
- * Copyright 2018 The ANGLE Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-package com.android.angle;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class MainActivity extends Activity
-{
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-    }
-}

src/feature_support_util/a4a_rules.json

@@ -9,13 +9,7 @@
          "UseANGLE":true,
          "Applications":[
             {
-               "AppName":"com.android.angle"
-            },
-            {
-               "AppName":"com.google.android.apps.internal.cubey"
-            },
-            {
-               "AppName":"com.android.gl2jni"
+               "AppName":"com.chromium.angle"
             }
          ],
          "Devices":[