🔔 Allow android_* targets to specify proguard flags for apks

build/android/gyp/write_build_config.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Writes a build_config file.
 
 The build_config file for a target is a json file containing information about
 how to build that target based on the target's dependencies. This includes
@@ skipping 260 matching lines @@
                     help="Path to the target's incremental apk output.")
   parser.add_option('--incremental-install-script-path',
                     help="Path to the target's generated incremental install "
                     "script.")
 
   parser.add_option('--tested-apk-config',
       help='Path to the build config of the tested apk (for an instrumentation '
       'test apk).')
   parser.add_option('--proguard-enabled', action='store_true',
       help='Whether proguard is enabled for this apk.')
+  parser.add_option('--proguard-configs',
+      help='GYP-list of proguard flag files to use in final apk.')

[Ian Wen, 2016/09/01 01:31:55]

Q: do we have plans to rename GYP-list to GN-list in future?

[agrieve, 2016/09/01 14:07:08]

We definitely should :)

   parser.add_option('--proguard-info',
       help='Path to the proguard .info output for this apk.')
   parser.add_option('--has-alternative-locale-resource', action='store_true',
       help='Whether there is alternative-locale-resource in direct deps')
   parser.add_option('--fail',
       help='GYP-list of error message lines to fail with.')
 
   options, args = parser.parse_args(argv)
 
   if args:
@@ skipping 276 matching lines @@
 
     # Exclude dex files from the test apk that exist within the apk under test.
     # TODO(agrieve): When proguard is enabled, this filtering logic happens
     #     within proguard_util.py. Move the logic for the proguard case into
     #     here as well.
     tested_apk_library_deps = tested_apk_deps.All('java_library')
     tested_apk_deps_dex_files = [c['dex_path'] for c in tested_apk_library_deps]
     deps_dex_files = [
         p for p in deps_dex_files if not p in tested_apk_deps_dex_files]
 
+  if options.proguard_configs:
+    assert options.type == 'java_library'
+    deps_info['proguard_configs'] = (
+        build_utils.ParseGnList(options.proguard_configs))
+
   if options.type == 'android_apk':
     deps_info['proguard_enabled'] = options.proguard_enabled
     deps_info['proguard_info'] = options.proguard_info
     config['proguard'] = {}
     proguard_config = config['proguard']
     proguard_config['input_paths'] = [options.jar_path] + java_full_classpath
     extra_jars = set()
+    lib_configs = set()
     for c in all_library_deps:
       extra_jars.update(c.get('extra_classpath_jars', ()))
+      lib_configs.update(c.get('proguard_configs', ()))
     proguard_config['lib_paths'] = list(extra_jars)
+    proguard_config['lib_configs'] = list(lib_configs)
 
   # Dependencies for the final dex file of an apk or a 'deps_dex'.
   if options.type in ['android_apk', 'deps_dex']:
     config['final_dex'] = {}
     dex_config = config['final_dex']
     dex_config['dependency_dex_files'] = deps_dex_files
 
   if options.type in ('java_binary', 'java_library', 'android_apk'):
     config['javac']['classpath'] = javac_classpath
     config['javac']['interface_classpath'] = [
@@ skipping 36 matching lines @@
         _MergeAssets(deps.All('android_assets')))
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, all_inputs)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))