DO NOT SUBMIT: add main dex list check to classloader.

build/config/android/rules.gni

 # 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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 1711 matching lines @@
       if (defined(_java_sources_file)) {
         java_sources_file = _java_sources_file
       }
 
       deps = _android_manifest_deps
 
       if (defined(invoker.deps)) {
         possible_config_deps = invoker.deps
       }
 
+      if (enable_multidex) {
+        possible_config_deps += [ ":${final_dex_target_name}_assets" ]
+      }
+
       # Added emma to the target's classpath via its .build_config.
       if (emma_coverage && !_emma_never_instrument) {
         possible_config_deps +=
             [ "//third_party/android_tools:emma_device_java" ]
       }
 
       proguard_enabled = _proguard_enabled
       if (_proguard_enabled) {
         proguard_info = "$_proguard_output_jar_path.info"
       }
@@ skipping 119 matching lines @@
           ":$build_config_target",
         ]
 
         defines = []
         if (enable_multidex) {
           defines += [ "ENABLE_MULTIDEX" ]
         }
         if (is_java_debug || dcheck_always_on) {
           defines += [ "_DCHECK_IS_ON" ]
         }
+        if (is_official_build) {
+          defines += [ "IS_OFFICIAL_BUILD" ]
+        }
         defines += [
           "COMPRESSED_LOCALE_LIST=" +
               "@FileArg($_rebased_build_config:compressed_locales_java_list)",
           "UNCOMPRESSED_LOCALE_LIST=" +
               "@FileArg($_rebased_build_config:uncompressed_locales_java_list)",
         ]
       }
       _srcjar_deps += [ ":${_template_name}__build_config_java" ]
     }
 
@@ skipping 118 matching lines @@
       }
     } else {
       if (enable_multidex) {
         _dex_sources = [ _jar_path ]
       } else {
         _dex_sources = [ _lib_dex_path ]
       }
       _dex_deps = [ ":$java_target" ]
     }
 
+    if (enable_multidex) {
+      final_dex_list = "${final_dex_path}_java_list.csv"
+    }
     dex("$final_dex_target_name") {
       deps = _dex_deps + [ ":$build_config_target" ]
       inputs = [
         _build_config,
       ]
       sources = _dex_sources
       output = final_dex_path
+      if (enable_multidex) {
+        list_output = final_dex_list
+      }
 
       # All deps are already included in _dex_sources when proguard is used.
       if (!_proguard_enabled) {
         if (enable_multidex) {
           _dex_arg_key = "${_rebased_build_config}:dist_jar:dependency_jars"
           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"
@@ skipping 72 matching lines @@
         _extra_native_libs =
             [ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ]
         _extra_native_libs_deps +=
             [ "//base/android/linker:chromium_android_linker" ]
       }
     }
     if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) {
       _extra_native_libs_even_when_incremental += invoker.loadable_modules
     }
 
+    if (enable_multidex) {
+      _final_deps += [ ":${final_dex_target_name}_assets" ]
+      android_assets("${final_dex_target_name}_assets") {
+        disable_compression = true
+        deps = [
+          ":$final_dex_target_name",
+        ]
+        sources = [
+          "${final_dex_path}_java_list.csv",
+        ]
+      }
+    }
+
     _final_deps += [ ":${_template_name}__create" ]
     create_apk("${_template_name}__create") {
       forward_variables_from(invoker,
                              [
                                "aapt_locale_whitelist",
                                "alternative_android_sdk_jar",
                                "android_aapt_path",
                                "app_as_shared_lib",
                                "deps",
                                "extensions_to_not_compress",
@@ skipping 32 matching lines @@
       # Incremental apk does not use native libs nor final dex.
       incremental_deps = deps + _android_manifest_deps + [
                            ":$build_config_target",
                            ":$process_resources_target",
                          ]
 
       # This target generates the input file _all_resources_zip_path.
       deps += _android_manifest_deps + [
                 ":$build_config_target",
                 ":$process_resources_target",
-                ":$final_dex_target_name",
+                ":${final_dex_target_name}",
               ]
+      if (enable_multidex) {
+        deps += [ ":${final_dex_target_name}_assets" ]
+      }
 
       if ((_native_libs_deps != [] ||
            _extra_native_libs_even_when_incremental != []) &&
           !_create_abi_split) {
         deps += _native_libs_deps + _extra_native_libs_deps +
                 [ _native_libs_file_arg_dep ]
         native_libs_filearg = _native_libs_file_arg
         native_libs = _extra_native_libs
         native_libs_even_when_incremental =
             _extra_native_libs_even_when_incremental
@@ skipping 733 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }