Reland "Android: Remove BuildHooksAndroidImpl from the main dex."

This is a reland of eb3da872

Original change's description:
> Android: Remove BuildHooksAndroidImpl from the main dex.
> 
> Removing the reference to BuildHooksAndroidImpl from BuildHooksAndroid
> shrinks the main dex by ~2000 methods for downstream targets.
> 
> Bug: 820570
> Change-Id: If4051f7a85e387129c65a7a5b927183b5b36bf65
> Reviewed-on: https://chromium-review.googlesource.com/1089625
> Commit-Queue: Eric Stevenson <estevenson@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#565305}

Bug: 820570
Change-Id: I8fbaf650ac1ed444ccc6d2cbd3d6d45ab045451f
Reviewed-on: https://chromium-review.googlesource.com/1093111Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567370}

build/android/buildhooks/BUILD.gn

@@ -43,6 +43,7 @@ android_library("build_hooks_android_java") {
 
   jar_excluded_patterns = [ "*/BuildHooksAndroidImpl.class" ]
   no_build_hooks = true
+  proguard_configs = [ "proguard/build_hooks_android_impl.flags" ]
 }
 
 # This default implementation is used if an android_apk target doesn't

build/android/buildhooks/java/org/chromium/build/BuildHooksAndroid.java

@@ -19,54 +19,79 @@ import android.content.res.Resources;
  * implementation is supplied to an android_apk target (via build_hooks_android_impl_deps).
  */
 public abstract class BuildHooksAndroid {
-    private static final BuildHooksAndroidImpl sInstance = new BuildHooksAndroidImpl();
+    private static BuildHooksAndroid sInstance;
+
+    private static BuildHooksAndroid get() {
+        if (sInstance == null) {
+            sInstance = constructBuildHooksAndroidImpl();
+        }
+        return sInstance;
+    }
+
+    // Creates an instance of BuildHooksAndroidImpl using reflection. Why is this necessary?
+    // The downstream version of BuildHooksAndroidImpl pulls a bunch of methods into the main dex
+    // that don't actually need to be there. This happens because there are @MainDex classes that
+    // have Context methods added (via. bytecode rewriting) that call into BuildHooksAndroid.
+    // Creating the instance via. reflection tricks proguard into thinking BuildHooksAndroidImpl
+    // doesn't need to be in the main dex file.
+    private static BuildHooksAndroid constructBuildHooksAndroidImpl() {
+        try {
+            // Not final to avoid inlining. Without this proguard is able to figure out that
+            // BuildHooksAndroidImpl is actually used.
+            String implClazzName = "org.chromium.build.BuildHooksAndroidImpl";
+            Class<?> implClazz = Class.forName(implClazzName);
+            return (BuildHooksAndroid) implClazz.newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     public static Resources getResources(Context context) {
-        return sInstance.getResourcesImpl(context);
+        return get().getResourcesImpl(context);
     }
 
     protected abstract Resources getResourcesImpl(Context context);
 
     public static AssetManager getAssets(Context context) {
-        return sInstance.getAssetsImpl(context);
+        return get().getAssetsImpl(context);
     }
 
     protected abstract AssetManager getAssetsImpl(Context context);
 
     public static Resources.Theme getTheme(Context context) {
-        return sInstance.getThemeImpl(context);
+        return get().getThemeImpl(context);
     }
 
     protected abstract Resources.Theme getThemeImpl(Context context);
 
     public static void setTheme(Context context, int theme) {
-        sInstance.setThemeImpl(context, theme);
+        get().setThemeImpl(context, theme);
     }
 
     protected abstract void setThemeImpl(Context context, int theme);
 
     public static Context createConfigurationContext(Context context) {
-        return sInstance.createConfigurationContextImpl(context);
+        return get().createConfigurationContextImpl(context);
     }
 
     protected abstract Context createConfigurationContextImpl(Context context);
 
     public static int getIdentifier(
             Resources resources, String name, String defType, String defPackage) {
-        return sInstance.getIdentifierImpl(resources, name, defType, defPackage);
+        return get().getIdentifierImpl(resources, name, defType, defPackage);
     }
 
     protected abstract int getIdentifierImpl(
             Resources resources, String name, String defType, String defPackage);
 
     public static boolean isEnabled() {
-        return sInstance.isEnabledImpl();
+        return get().isEnabledImpl();
     }
 
     protected abstract boolean isEnabledImpl();
 
     public static void initCustomResources(Context context) {
-        sInstance.initCustomResourcesImpl(context);
+        get().initCustomResourcesImpl(context);
     }
 
     protected abstract void initCustomResourcesImpl(Context context);
@@ -75,7 +100,7 @@ public abstract class BuildHooksAndroid {
      * Record custom resources related UMA. Requires native library to be loaded.
      */
     public static void maybeRecordResourceMetrics() {
-        sInstance.maybeRecordResourceMetricsImpl();
+        get().maybeRecordResourceMetricsImpl();
     }
 
     protected abstract void maybeRecordResourceMetricsImpl();

build/android/buildhooks/proguard/build_hooks_android_impl.flags

+# 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.
+
+-keep class org.chromium.build.BuildHooksAndroidImpl

chrome/android/chrome_public_apk_tmpl.gni

@@ -79,6 +79,11 @@ template("chrome_public_apk_tmpl") {
           "*R\$*",  # Should not use resources from non-browser process.
         ]
       }
+
+      # Allow targets to append to the default list.
+      if (defined(extra_negative_main_dex_globs)) {
+        negative_main_dex_globs += extra_negative_main_dex_globs
+      }
     }
     if (!is_java_debug) {
       proguard_enabled = true

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

@@ -63,13 +63,13 @@ public class ChromeApplication extends Application {
             UmaUtils.recordMainEntryPointTime();
         }
         super.attachBaseContext(context);
-        checkAppBeingReplaced();
         ContextUtils.initApplicationContext(this);
 
         if (browserProcess) {
             if (BuildConfig.IS_MULTIDEX_ENABLED) {
                 ChromiumMultiDexInstaller.install(this);
             }
+            checkAppBeingReplaced();
 
             // Renderers and GPU process have command line passed to them via IPC
             // (see ChildProcessService.java).
@@ -125,7 +125,7 @@ public class ChromeApplication extends Application {
         // During app update the old apk can still be triggered by broadcasts and spin up an
         // out-of-date application. Kill old applications in this bad state. See
         // http://crbug.com/658130 for more context and http://b.android.com/56296 for the bug.
-        if (getResources() == null) {
+        if (ContextUtils.getApplicationAssets() == null) {
             Log.e(TAG, "getResources() null, closing app.");
             System.exit(0);
         }