Bug 1255914 - Part 2: mostly back out multiDex (changeset 6972bef6693c). r=sebastian

Since we're Proguarding the automation build now, we shouldn't need to
multiDex anymore -- even in beta.

MozReview-Commit-ID: 6Yc73Vi9Fhd

--HG--
extra : rebase_source : cdfb01a47dc05dfafc4ba67cdb30f86dbd5aa4ec

mobile/android/app/build.gradle

@@ -81,9 +81,6 @@ android {
             minSdkVersion 21
             dexOptions {
                 preDexLibraries true
-                // We only call `MultiDex.install()` for the automation build flavor
-                // so this may not work. However, I don't think the multidex support
-                // library is necessary for 21+, so I expect that it will work.
                 multiDexEnabled true
             }
         }
@@ -94,17 +91,6 @@ android {
         }
         // Automation builds.
         automation {
-            dexOptions {
-                // As of FF48 on beta, the "test", "lint", etc. treeherder jobs fail because they
-                // exceed the method limit. Beta includes Adjust and its GPS dependencies, which
-                // increase the method count & explain the failures. Furthermore, this error only
-                // occurs on debug builds because we don't proguard.
-                //
-                // We enable multidex as an easy, quick-fix with minimal side effects but before we
-                // move to gradle for our production builds, we should re-evaluate this decision
-                // (bug 1286677).
-                multiDexEnabled true
-            }
         }
     }
 
@@ -219,8 +205,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:multidex:1.0.0'
-
     compile "com.android.support:support-v4:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
     compile "com.android.support:appcompat-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
     compile "com.android.support:cardview-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"

mobile/android/base/AppConstants.java.in

@@ -6,11 +6,7 @@
 
 package org.mozilla.gecko;
 
-import android.content.Context;
 import android.os.Build;
-//#ifdef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
-import android.support.multidex.MultiDex;
-//#endif
 
 /**
  * A collection of constants that pertain to the build and runtime state of the
@@ -323,23 +319,6 @@ public class AppConstants {
     // (bug 1266820) Temporarily disabled since no one is working on it.
     public static final boolean SCREENSHOTS_IN_BOOKMARKS_ENABLED = false;
 
-    /**
-     * Enables multidex depending on build flags. For more information,
-     * see `multiDexEnabled true` in mobile/android/app/build.gradle.
-     *
-     * As a method, this shouldn't be in AppConstants, but it's
-     * the only semi-relevant Java file that we pre-process.
-     */
-    public static void maybeInstallMultiDex(final Context context) {
-//#ifdef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
-        if (BuildConfig.FLAVOR.equals("automation")) {
-            MultiDex.install(context);
-        }
-//#else
-        // Do nothing.
-//#endif
-    }
-
     public static final boolean MOZ_ANDROID_ACTIVITY_STREAM =
 //#ifdef MOZ_ANDROID_ACTIVITY_STREAM
         true;

mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java

@@ -146,12 +146,6 @@ public class GeckoApplication extends Application
         mInBackground = false;
     }
 
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-        AppConstants.maybeInstallMultiDex(base);
-    }
-
     @Override
     public void onCreate() {
         Log.i(LOG_TAG, "zerdatime " + SystemClock.uptimeMillis() + " - Fennec application start");