[android] Make main_dex_list.py use the same proguard as everything else.

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 22 matching lines @@
                       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 '
                            'generated.')
+  parser.add_argument('--proguard-path', required=True,
+                      help='Path to the proguard executable.')
+
   parser.add_argument('paths', nargs='*', default=[],
                       help='JARs for which a main dex list should be '
                            'generated.')
 
   args = parser.parse_args(build_utils.ExpandFileArgs(args))
 
   if args.multidex_configuration_path:
     with open(args.multidex_configuration_path) as multidex_config_file:
       multidex_config = json.loads(multidex_config_file.read())
 
     if not multidex_config.get('enabled', False):
       return 0
 
   if args.inputs:
     args.paths.extend(build_utils.ParseGnList(args.inputs))
 
   shrinked_android_jar = os.path.abspath(
       os.path.join(args.android_sdk_tools, 'lib', 'shrinkedAndroid.jar'))
   dx_jar = os.path.abspath(
       os.path.join(args.android_sdk_tools, 'lib', 'dx.jar'))
   rules_file = os.path.abspath(
       os.path.join(args.android_sdk_tools, 'mainDexClasses.rules'))
 
   proguard_cmd = [
-    constants.PROGUARD_SCRIPT_PATH,
+    'java', '-jar', args.proguard_path,
     '-forceprocessing',
     '-dontwarn', '-dontoptimize', '-dontobfuscate', '-dontpreverify',
     '-libraryjars', shrinked_android_jar,
     '-include', rules_file,
   ]
   for m in args.main_dex_rules_paths:
     proguard_cmd.extend(['-include', m])
 
   main_dex_list_cmd = [
     'java', '-cp', dx_jar,
@@ skipping 51 matching lines @@
     else:
       raise
 
   with open(main_dex_list_path, 'w') as main_dex_list_file:
     main_dex_list_file.write(main_dex_list)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))