[Android] Enable multidex for release builds of chrome_public_test_apk. (RELAND)

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

 // Copyright 2015 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.
 
 package org.chromium.base.multidex;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningAppProcessInfo;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.support.multidex.MultiDex;
 
-import org.chromium.base.BuildConfig;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 /**
  *  Performs multidex installation for non-isolated processes.
  */
 public class ChromiumMultiDexInstaller {
@@ skipping 15 matching lines @@
      *  In release builds of app apks (as opposed to test apks), this is a no-op because:
      *    - multidex isn't necessary in release builds because we run proguard there and
      *      thus aren't threatening to hit the dex limit; and
      *    - calling MultiDex.install, even in the absence of secondary dexes, causes a
      *      significant regression in start-up time (crbug.com/525695).
      *
      *  @param context The application context.
      */
     @VisibleForTesting
     public static void install(Context context) {
-        if (!BuildConfig.isMultidexEnabled()) return;
-
         // TODO(jbudorick): Back out this version check once support for K & below works.
         // http://crbug.com/512357
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP
                 && !shouldInstallMultiDex(context)) {
             Log.i(TAG, "Skipping multidex installation: not needed for process.");
         } else {
             MultiDex.install(context);
             Log.i(TAG, "Completed multidex installation.");
         }
     }
@@ skipping 43 matching lines @@
             ApplicationInfo appInfo = packageManager.getApplicationInfo(context.getPackageName(),
                     PackageManager.GET_META_DATA);
             if (appInfo == null || appInfo.metaData == null) return true;
             return !appInfo.metaData.getBoolean(currentProcessName + IGNORE_MULTIDEX_KEY, false);
         } catch (PackageManager.NameNotFoundException e) {
             return true;
         }
     }
 
 }