Android: Hook up aapt's main dex proguard rules

build/android/gyp/process_resources.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Process Android resources to generate R.java, and prepare for packaging.
 
 This will crunch images and generate v14 compatible resources
 (see generate_v14_compatible_resources.py).
@@ skipping 64 matching lines @@
                     help='Path to srcjar to contain generated R.java.')
   parser.add_option('--r-text-out',
                     help='Path to store the generated R.txt file.')
   parser.add_option('--r-text-in',
                     help='Path to pre-existing R.txt for these resources. '
                     'Resource names from it will be used to generate R.java '
                     'instead of aapt-generated R.txt.')
 
   parser.add_option('--proguard-file',
                     help='Path to proguard.txt generated file')
+  parser.add_option('--proguard-file-main-dex',
+                    help='Path to proguard.txt generated file for main dex')
 
   parser.add_option(
       '--v14-skip',
       action="store_true",
       help='Do not generate nor verify v14 resources')
 
   parser.add_option(
       '--extra-res-packages',
       help='Additional package names to generate R.java files for')
   parser.add_option(
@@ skipping 345 matching lines @@
     # to symbols within dependencies to resolve. However, it has the side-effect
     # that all Java symbols from dependencies are copied into the new R.java.
     # E.g.: It enables an arguably incorrect usage of
     # "mypackage.R.id.lib_symbol" where "libpackage.R.id.lib_symbol" would be
     # more correct. This is just how Android works.
     for d in dep_subdirs:
       package_command += ['-S', d]
 
     if options.proguard_file:
       package_command += ['-G', options.proguard_file]
+    if options.proguard_file_main_dex:
+      package_command += ['-D', options.proguard_file_main_dex]
     build_utils.CheckOutput(package_command, print_stderr=False)
 
     # When an empty res/ directory is passed, aapt does not write an R.txt.
     if not os.path.exists(r_txt_path):
       build_utils.Touch(r_txt_path)
 
     if not options.include_all_resources:
       # --include-all-resources can only be specified for generating final R
       # classes for APK. It makes no sense for APK to have pre-generated R.txt
       # though, because aapt-generated already lists all available resources.
@@ skipping 54 matching lines @@
 
 
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   options = _ParseArgs(args)
 
   possible_output_paths = [
     options.resource_zip_out,
     options.all_resources_zip_out,
     options.proguard_file,
+    options.proguard_file_main_dex,
     options.r_text_out,
     options.srcjar_out,
   ]
   output_paths = [x for x in possible_output_paths if x]
 
   # List python deps in input_strings rather than input_paths since the contents
   # of them does not change what gets written to the depsfile.
   input_strings = options.extra_res_packages + [
     options.app_as_shared_lib,
     options.custom_package,
@@ skipping 26 matching lines @@
       options,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=output_paths,
       # TODO(agrieve): Remove R_dir when it's no longer used (used only by GYP).
       force=options.R_dir)
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])