Enable multidex for ChromePublic.apk.

chrome/android/chrome_public_apk_tmpl.gni

 # 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.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/rules.gni")
 import("//chrome/common/features.gni")
 import("//third_party/leakcanary/config.gni")
 import("channel.gni")
 
@@ skipping 23 matching lines @@
   "enable_webvr=$enable_webvr",
 ]
 
 template("chrome_public_apk_tmpl") {
   android_apk(target_name) {
     forward_variables_from(invoker, "*")
     _native_lib_file =
         rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
     native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
 
-    if (is_java_debug) {
-      enable_multidex = true
-    } else {
+    enable_multidex = true
+    if (!is_java_debug) {
       proguard_enabled = true
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
       proguard_configs += [
+        "//build/android/main_dex_classes.flags",
         "//chrome/android/java/proguard.flags",
         "//base/android/proguard/chromium_apk.flags",
         "//base/android/proguard/chromium_code.flags",
       ]
       if (enable_proguard_obfuscation) {
         proguard_configs += [ "//chrome/android/java/proguard-obfuscate.flags" ]
       } else {
         proguard_configs +=
             [ "//chrome/android/java/proguard-dont-obfuscate.flags" ]
       }
@@ skipping 53 matching lines @@
     ]
 
     if (!is_java_debug) {
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
       proguard_configs += [ "//android_webview/apk/java/proguard.flags" ]
     }
   }
 }