Enable proguard for apks

build/android/gyp/proguard.py

Index: build/android/gyp/proguard.py
diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
index 5127100a890ce5545f6b3c89c02a43651c6767e3..61269868b75dc772ffea23f71ce76df8c916d4ee 100755
--- a/build/android/gyp/proguard.py
+++ b/build/android/gyp/proguard.py
@@ -19,8 +19,8 @@ def DoProguard(options):
   if options.mapping:
     proguard.mapping(options.mapping)
 
-  if options.is_test:
-    proguard.is_test(True)
+  if options.tested_apk_info:
+    proguard.is_test(options.tested_apk_info)
 
   classpath = []
   for arg in options.classpath:
@@ -48,6 +48,8 @@ def main(args):
   parser.add_option('--is-test', action='store_true',
       help='If true, extra proguard options for instrumentation tests will be '
       'added.')
+  parser.add_option('--tested-apk-info', help='Path to the proguard .info file '
+      'for the tested apk')
   parser.add_option('--classpath', action='append',
                     help='Classpath for proguard.')
   parser.add_option('--stamp', help='Path to touch on success.')