Reland of GN: Enable proguard for apks

build/android/gyp/apk_obfuscate.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.
 
 """Generates the obfuscated jar and test jar for an apk.
 
 If proguard is not enabled or 'Release' is not in the configuration name,
 obfuscation will be a no-op.
@@ skipping 67 matching lines @@
         )
 
   build_utils.CheckOptions(options, parser, required=required_options)
   return options, args
 
 
 def DoProguard(options):
   proguard = proguard_util.ProguardCmdBuilder(options.proguard_jar_path)
   proguard.outjar(options.obfuscated_jar_path)
 
-  library_classpath = [options.android_sdk_jar]
   input_jars = build_utils.ParseGypList(options.input_jars_paths)
 
   exclude_paths = []
   configs = build_utils.ParseGypList(options.proguard_configs)
   if options.tested_apk_obfuscated_jar_path:
     # configs should only contain the process_resources.py generated config.
     assert len(configs) == 1, (
         'test apks should not have custom proguard configs: ' + str(configs))
-    tested_jar_info = build_utils.ReadJson(
-        options.tested_apk_obfuscated_jar_path + '.info')
-    exclude_paths = tested_jar_info['inputs']
-    configs = tested_jar_info['configs']
+    proguard.tested_apk_info(options.tested_apk_obfuscated_jar_path + '.info')
 
-    proguard.is_test(True)
-    proguard.mapping(options.tested_apk_obfuscated_jar_path + '.mapping')
-    library_classpath.append(options.tested_apk_obfuscated_jar_path)
-
-  proguard.libraryjars(library_classpath)
+  proguard.libraryjars([options.android_sdk_jar])
   proguard_injars = [p for p in input_jars if p not in exclude_paths]
   proguard.injars(proguard_injars)
   proguard.configs(configs)
 
   proguard.CheckOutput()
 
-  this_info = {
-    'inputs': proguard_injars,
-    'configs': configs
-  }
-
-  build_utils.WriteJson(
-      this_info, options.obfuscated_jar_path + '.info')
-
 
 def main(argv):
   options, _ = ParseArgs(argv)
 
   input_jars = build_utils.ParseGypList(options.input_jars_paths)
 
   if options.testapp:
     dependency_class_filters = [
         '*R.class', '*R$*.class', '*Manifest.class', '*BuildConfig.class']
     build_utils.MergeZips(
@@ skipping 14 matching lines @@
     for f in output_files:
       if os.path.exists(f):
         os.remove(f)
       build_utils.Touch(f)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))