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

build/android/gyp/main_dex_list.py

 #!/usr/bin/env python
 #
 # 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 argparse
 import json
 import os
 import sys
@@ skipping 11 matching lines @@
   build_utils.AddDepfileOption(parser)
   parser.add_argument('--android-sdk-tools', required=True,
                       help='Android sdk build tools directory.')
   parser.add_argument('--main-dex-rules-path', action='append', default=[],
                       dest='main_dex_rules_paths',
                       help='A file containing a list of proguard rules to use '
                            'in determining the class to include in the '
                            'main dex.')
   parser.add_argument('--main-dex-list-path', required=True,
                       help='The main dex list file to generate.')
+  parser.add_argument('--main-dex-list-path-java', required=True,
+                      help='The main dex list file to generate.')
   parser.add_argument('--enabled-configurations',
                       help='The build configurations for which a main dex list'
                            ' should be generated.')
   parser.add_argument('--configuration-name',
                       help='The current build configuration.')
   parser.add_argument('--multidex-configuration-path',
                       help='A JSON file containing multidex build '
                            'configuration.')
   parser.add_argument('--inputs',
                       help='JARs for which a main dex list should be '
@@ skipping 51 matching lines @@
     proguard_cmd,
     main_dex_list_cmd,
   ]
 
   output_paths = [
     args.main_dex_list_path,
   ]
 
   build_utils.CallAndWriteDepfileIfStale(
       lambda: _OnStaleMd5(proguard_cmd, main_dex_list_cmd, args.paths,
-                          args.main_dex_list_path),
+                          args.main_dex_list_path, args.main_dex_list_path_java),
       args,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=output_paths)
 
   return 0
 
 
-def _OnStaleMd5(proguard_cmd, main_dex_list_cmd, paths, main_dex_list_path):
+def _OnStaleMd5(proguard_cmd, main_dex_list_cmd, paths, main_dex_list_path, main_dex_list_path_java):
   paths_arg = ':'.join(paths)
   main_dex_list = ''
   try:
     with tempfile.NamedTemporaryFile(suffix='.jar') as temp_jar:
       proguard_cmd += [
         '-injars', paths_arg,
         '-outjars', temp_jar.name
       ]
       build_utils.CheckOutput(proguard_cmd, print_stderr=False)
 
       main_dex_list_cmd += [
         temp_jar.name, paths_arg
       ]
       main_dex_list = build_utils.CheckOutput(main_dex_list_cmd)
   except build_utils.CalledProcessError as e:
     if 'output jar is empty' in e.output:
       pass
     elif "input doesn't contain any classes" in e.output:
       pass
     else:
       raise
 
+  tmp = []
+  for line in main_dex_list.split('\n'):
+    if 'FileDescriptorInfo' not in line:
+      tmp.append(line)
+  main_dex_list = '\n'.join(l for l in tmp)
+
   with open(main_dex_list_path, 'w') as main_dex_list_file:
     main_dex_list_file.write(main_dex_list)
 
+  if main_dex_list_path_java:
+    with open(main_dex_list_path_java, 'w') as main_dex_list_file:
+      main_dex_list_file.write(
+          ','.join([c.replace('/', '.').split('.class')[0]
+                    for c in main_dex_list.split('\n')]))
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))