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

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index eddbbf3bdf58d8ad86f919834d76c2c2a2be30e7..158195649021110a9fb174f85ceaa8b55d620e98 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1729,6 +1729,10 @@ if (enable_java_templates) {
         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 +=
@@ -1868,6 +1872,9 @@ if (enable_java_templates) {
         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)",
@@ -2006,6 +2013,9 @@ if (enable_java_templates) {
       _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 = [
@@ -2013,6 +2023,9 @@ if (enable_java_templates) {
       ]
       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) {
@@ -2105,6 +2118,19 @@ if (enable_java_templates) {
       _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,
@@ -2157,8 +2183,11 @@ if (enable_java_templates) {
       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 != []) &&