Android: Clean up the ANGLE APK

* Rename the APK package name to reflect that it is from Chromium build.
* Rename the application to reflect it is no longer used on Android system image.
* Remove code supporting multiple APKs, since we only have one now.
* Remove the placeholder icon, which is no longer needed.
* Remove the ANGLE_FOR_ANDROID intent, since this APK is not built in.
* Remove the java code since since it was only in support of the intent.
* Remove most apps from the rules file.

Bug: angleproject:3396
Change-Id: Ic6a2fd03e5686026ab4650fc0c25adb298af03c2
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1579389
Reviewed-by: Tim Van Patten <timvp@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Cody Northrop <cnorthrop@google.com>

4 files changed, 2 insertions, 42 deletions

diff --git a/android/AndroidManifest.xml.jinja2 b/android/AndroidManifest.xml.jinja2
index afe1834e62..b559b37da2 100644
--- a/android/AndroidManifest.xml.jinja2
+++ b/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>
diff --git a/android/angle_apk.gni b/android/angle_apk.gni
index 1f0c94e6db..d2904abc08 100644
--- a/android/angle_apk.gni
+++ b/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" ]
diff --git a/android/res/drawable/icon.png b/android/res/drawable/icon.png
deleted file mode 100644
index d8cfd51e06..0000000000
--- a/android/res/drawable/icon.png
+++ /dev/null
diff --git a/android/src/com/android/angle/MainActivity.java b/android/src/com/android/angle/MainActivity.java
deleted file mode 100644
index 6fc8ad6060..0000000000
--- a/android/src/com/android/angle/MainActivity.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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);
-    }
-}