Android: Remove ApplicationStatus from @MainDex

ApplicationStatus ends up pulling in a *lot* of code, because it ends up
pulling in all of its listeners.

This reduces the main dex size by 3400 methods.

To get ApplicationStatus to not be included:
 * Made @MainDex applicable to methods
   * Changed ContextUtils and ChromeApplication to annotate methods
     rather than entire class.
 * Stopped using mainDexClasses.rules, in order to avoid -keep'ing all
   of ChromeApplication.attachBaseContext(). Really, all that's needed
   to be kept is the part of attachBaseContext() before the
   ChromiumMultiDexInstaller.install() call.

Bug: 820570
Change-Id: I39220b99f6d89b2429ba7406619a485179a3b2fc
Reviewed-on: https://chromium-review.googlesource.com/963307
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543831}

base/android/java/src/org/chromium/base/ApplicationStatus.java

@@ -14,7 +14,6 @@ import android.view.Window;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.MainDex;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationHandler;
@@ -31,7 +30,6 @@ import java.util.concurrent.ConcurrentHashMap;
  * to register / unregister listeners for state changes.
  */
 @JNINamespace("base::android")
-@MainDex
 public class ApplicationStatus {
     private static final String TOOLBAR_CALLBACK_INTERNAL_WRAPPER_CLASS =
             "android.support.v7.internal.app.ToolbarActionBar$ToolbarCallbackWrapper";

base/android/java/src/org/chromium/base/annotations/MainDex.java

@@ -15,7 +15,6 @@ import java.lang.annotation.Target;
  * This generally means it's used by renderer processes, which can't load secondary dexes
  * on K and below.
  */
-@Target(ElementType.TYPE)
+@Target({ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.CLASS)
-public @interface MainDex {
-}
+public @interface MainDex {}

base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java

@@ -13,12 +13,13 @@ import android.support.multidex.MultiDex;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.MainDex;
 
 /**
  *  Performs multidex installation for non-isolated processes.
  */
+@MainDex
 public class ChromiumMultiDexInstaller {
-
     private static final String TAG = "base_multidex";
 
     /**

build/android/gyp/main_dex_list.py

@@ -63,15 +63,12 @@ def main(args):
       os.path.join(args.android_sdk_tools, 'lib', 'shrinkedAndroid.jar'))
   dx_jar = os.path.abspath(
       os.path.join(args.android_sdk_tools, 'lib', 'dx.jar'))
-  rules_file = os.path.abspath(
-      os.path.join(args.android_sdk_tools, 'mainDexClasses.rules'))
 
   proguard_cmd = [
     'java', '-jar', args.proguard_path,
     '-forceprocessing',
     '-dontwarn', '-dontoptimize', '-dontobfuscate', '-dontpreverify',
     '-libraryjars', shrinked_android_jar,
-    '-include', rules_file,
   ]
   for m in args.main_dex_rules_paths:
     proguard_cmd.extend(['-include', m])
@@ -89,7 +86,6 @@ def main(args):
   input_paths += [
     shrinked_android_jar,
     dx_jar,
-    rules_file,
   ]
   input_paths += args.main_dex_rules_paths
 

build/android/main_dex_classes.flags

@@ -9,6 +9,10 @@
   *;
 }
 
+-keepclasseswithmembers class * {
+  @**.MainDex *;
+}
+
 -keepclasseswithmembers class * {
   public static ** asInterface(android.os.IBinder);
 }
@@ -30,3 +34,24 @@
 # Need test classes to be in the main dex because test listing does not
 # load secondary dex on Dalvik devices.
 -keep @**.RunWith class * {}
+
+# The following are based on $SDK_BUILD_TOOLS/mainDexClasses.rules
+# Ours differ in that it omits -keeps for application / instrumentation /
+# backupagents (these are added by aapt's main dex list rules output).
+# The keeps in this file are not only redundant, but the explicit -keep
+# of Application.attachBaseContext() is overly broad and adds ~20k methods to
+# chrome_public_apk at the time of this change.
+
+######## START mainDexClasses.rules ########
+
+# We need to keep all annotation classes because proguard does not trace annotation attribute
+# it just filter the annotation attributes according to annotation classes it already kept.
+-keep public class * extends java.lang.annotation.Annotation {
+ *;
+}
+# Keep old fashion tests in the main dex or they'll be silently ignored by InstrumentationTestRunner↵
+-keep public class * extends android.test.InstrumentationTestCase {
+ <init>();
+}
+
+######## END mainDexClasses.rules ########

build/android/multidex.flags

@@ -2,11 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Proguard flags for what to keep through proguarding when multidex is
-# enabled. Not used during main dex list determination.
-
+# When multidex is enabled, need to keep the @MainDex annotation so that it
+# can be used to create the main dex list.
 -keepattributes *Annotations*
 -keep @interface org.chromium.base.annotations.MainDex
--keep @**.MainDex class * {
-  *;
+
+# Keep the members only if the class is kept. Also required for the annotation
+# itself to be kept, which is necessary for main dex list processing.
+-keepclassmembers,allowobfuscation class * {
+  @**.MainDex *;
 }

build/config/android/rules.gni

@@ -2296,13 +2296,16 @@ if (enable_java_templates) {
       output = _final_dex_path
       enable_multidex = _enable_multidex
 
+      if (_enable_multidex) {
+        extra_main_dex_proguard_config = _generated_proguard_main_dex_config
+        deps += [ ":$_process_resources_target" ]
+      }
+
       # All deps are already included in _dex_sources when proguard is used.
       if (!_proguard_enabled) {
         if (_enable_multidex) {
           _dex_arg_key =
               "${_rebased_build_config}:deps_info:java_runtime_classpath"
-          extra_main_dex_proguard_config = _generated_proguard_main_dex_config
-          deps += [ ":$_process_resources_target" ]
         } else {
           _dex_arg_key =
               "${_rebased_build_config}:final_dex:dependency_dex_files"

chrome/android/java/src/org/chromium/chrome/browser/BrowserRestartActivity.java

@@ -11,6 +11,7 @@ import android.os.Bundle;
 import android.os.Process;
 
 import org.chromium.base.ContextUtils;
+import org.chromium.base.annotations.MainDex;
 import org.chromium.chrome.browser.util.IntentUtils;
 
 /**
@@ -24,6 +25,7 @@ import org.chromium.chrome.browser.util.IntentUtils;
  * process' Activities.  It works around an Android framework issue for alarms set via the
  * AlarmManager, which requires a minimum alarm duration of 5 seconds: https://crbug.com/515919.
  */
+@MainDex // Runs in a separate process.
 public class BrowserRestartActivity extends Activity {
     public static final String EXTRA_MAIN_PID =
             "org.chromium.chrome.browser.BrowserRestartActivity.main_pid";

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
  * Basic application functionality that should be shared among all browser applications that use
  * chrome layer.
  */
-@MainDex
 public class ChromeApplication extends Application {
     private static final String COMMAND_LINE_FILE = "chrome-command-line";
     private static final String TAG = "ChromiumApplication";
@@ -57,15 +56,19 @@ public class ChromeApplication extends Application {
     // Quirk: context.getApplicationContext() returns null during this method.
     @Override
     protected void attachBaseContext(Context context) {
-        UmaUtils.recordMainEntryPointTime();
+        boolean browserProcess = ContextUtils.isMainProcess();
+        if (browserProcess) {
+            UmaUtils.recordMainEntryPointTime();
+        }
         super.attachBaseContext(context);
         checkAppBeingReplaced();
-        if (BuildConfig.IS_MULTIDEX_ENABLED) {
-            ChromiumMultiDexInstaller.install(this);
-        }
         ContextUtils.initApplicationContext(this);
 
-        if (ContextUtils.isMainProcess()) {
+        if (browserProcess) {
+            if (BuildConfig.IS_MULTIDEX_ENABLED) {
+                ChromiumMultiDexInstaller.install(this);
+            }
+
             // Renderers and GPU process have command line passed to them via IPC
             // (see ChildProcessService.java).
             Supplier<Boolean> shouldUseDebugFlags = new Supplier<Boolean>() {
@@ -115,6 +118,7 @@ public class ChromeApplication extends Application {
         }
     }
 
+    @MainDex
     @Override
     public void onTrimMemory(int level) {
         super.onTrimMemory(level);
@@ -158,6 +162,7 @@ public class ChromeApplication extends Application {
     /**
      * @return The DiscardableReferencePool for the application.
      */
+    @MainDex
     public DiscardableReferencePool getReferencePool() {
         ThreadUtils.assertOnUiThread();
         if (mReferencePool == null) {

chrome/test/BUILD.gn

@@ -2824,8 +2824,6 @@ test("unit_tests") {
       deps += [ "//v8:v8_external_startup_data_assets" ]
     }
 
-    android_manifest =
-        "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
     enable_multidex = true
   } else {
     # !is_android

chrome/test/android/unit_tests_apk/AndroidManifest.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.chromium.native_test"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <application android:label="NativeTests"
-            android:name="org.chromium.chrome.browser.ChromeApplication">
-        <activity android:name="org.chromium.native_test.NativeUnitTestActivity"
-                android:label="NativeTest"
-                android:configChanges="orientation|keyboardHidden"
-                android:process=":test_process">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-    <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
-            android:targetPackage="org.chromium.native_test"
-            android:label="Instrumentation entry point for org.chromium.native_test"/>
-
-</manifest>

content/shell/android/BUILD.gn

@@ -64,7 +64,6 @@ android_library("content_shell_java") {
     ":content_shell_java_resources",
     ":content_shell_manifest",
     "//base:base_java",
-    "//base:base_java_test_support",
     "//components/content_view:content_view_java",
     "//content/public/android:content_java",
     "//device/geolocation:geolocation_java",
@@ -200,7 +199,7 @@ android_library("content_shell_test_java") {
 
 instrumentation_test_apk("content_shell_test_apk") {
   deps = [
-    "//base:base_javatests",
+    "//base:base_java_test_support",
     "//content/public/android:content_javatests",
     "//net/android:net_javatests",
     "//third_party/android_support_test_runner:runner_java",