Fix up proguard output filtering

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 51 matching lines @@
                     help='Output path for jar containing all the test apk\'s '
                     'code.')
 
   parser.add_option('--stamp', help='File to touch on success')
 
   parser.add_option('--main-dex-list-path',
                     help='The list of classes to retain in the main dex. '
                          'These will not be obfuscated.')
   parser.add_option('--multidex-configuration-path',
                     help='A JSON file containing multidex build configuration.')
+  parser.add_option('--verbose', '-v', action='store_true',
+                    help='Print all proguard output')
 
   (options, args) = parser.parse_args(argv)
 
   if args:
     parser.error('No positional arguments should be given. ' + str(args))
 
   # Check that required options have been provided.
   required_options = (
       'android_sdk',
       'android_sdk_tools',
@@ skipping 29 matching lines @@
 
   proguard.libraryjars([options.android_sdk_jar])
   proguard_injars = [p for p in input_jars if p not in exclude_paths]
   proguard.injars(proguard_injars)
 
   multidex_config = _PossibleMultidexConfig(options)
   if multidex_config:
     configs.append(multidex_config)
 
   proguard.configs(configs)
-  proguard.CheckOutput()
+  proguard.CheckOutput(options.verbose)
 
 
 def _PossibleMultidexConfig(options):
   if not options.multidex_configuration_path:
     return None
 
   with open(options.multidex_configuration_path) as multidex_config_file:
     multidex_config = json.loads(multidex_config_file.read())
 
   if not (multidex_config.get('enabled') and options.main_dex_list_path):
@@ skipping 41 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:]))