[Android] Fix proguard

build/android/gyp/dex.py

Index: build/android/gyp/dex.py
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
index 84a9c63741b816307cee9b8ebee4b2882ccd6e8f..86f3878f7f0d4b456906d32745916b807918f415 100755
--- a/build/android/gyp/dex.py
+++ b/build/android/gyp/dex.py
@@ -31,6 +31,12 @@ def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('--android-sdk-root', help='Android sdk root directory.')
   parser.add_option('--dex-path', help='Dex output path.')
+  parser.add_option('--configuration-name',
+      help='The build CONFIGURATION_NAME.')
+  parser.add_option('--proguard-enabled',
+      help='"true" if proguard is enabled.')
+  parser.add_option('--proguard-enabled-input-path',
+      help='Path to dex in Release mode when proguard is enabled.')
   parser.add_option('--stamp', help='Path to touch on success.')
 
   # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
@@ -38,6 +44,10 @@ def main(argv):
 
   options, paths = parser.parse_args()
 
+  if (options.proguard_enabled == "true"
+      and options.configuration_name == "Release"):
+    paths = [options.proguard_enabled_input_path]
+
   DoDex(options, paths)
 
   if options.stamp: