[Android] Fix proguard

build/java_apk.gypi

 # Copyright (c) 2012 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 462 matching lines @@
         '<(DEPTH)/build/android/ant/apk-obfuscate.xml',
 
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
       ],
     },
     {
       'action_name': 'dex_<(_target_name)',
-      'message': 'Dexing <(_target_name) jar',
       'variables': {
         'conditions': [
-          ['proguard_enabled=="true" and CONFIGURATION_NAME=="Release"', {
-            'dex_inputs': [ '<(obfuscated_jar_path)' ],
-            'dex_generated_inputs': [],
-          }, {
-            'dex_inputs': [
-              '>@(library_dexed_jars_paths)',
-            ],
-            'dex_generated_inputs': [
-              '<(classes_dir)',
-            ],
+          ['proguard_enabled == "true"', {
+            'input_paths': [ '<(obfuscate_stamp)' ],
+            'proguard_enabled_input_path': '<(obfuscated_jar_path)',
           }],
         ],
+        'input_paths': [ '<(compile_stamp)' ],
+        'dex_input_paths': [ '>@(library_dexed_jars_paths)' ],
+        'dex_generated_input_dirs': [ '<(classes_dir)' ],
+        'output_path': '<(dex_path)',
       },
-      'inputs': [
-        '<(DEPTH)/build/android/gyp/util/build_utils.py',
-        '<(DEPTH)/build/android/gyp/util/md5_check.py',
-        '<(DEPTH)/build/android/gyp/dex.py',
-        '<(compile_stamp)',
-        '>@(dex_inputs)',
-      ],
-      'outputs': [
-        '<(dex_path)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/build/android/gyp/dex.py',
-        '--dex-path=<(dex_path)',
-        '--android-sdk-root=<(android_sdk_root)',
-
-        # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
-        '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
-
-        '>@(dex_inputs)',
-        '>@(dex_generated_inputs)',
-      ]
+      'includes': [ 'android/dex_action.gypi' ],
     },
     {
       'action_name': 'ant package resources',
       'message': 'Packaging resources for <(_target_name) APK.',
       'inputs': [
         '<(DEPTH)/build/android/ant/apk-package-resources.xml',
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/ant.py',
         '<(android_manifest_path)',
         '<(codegen_stamp)',
@@ skipping 94 matching lines @@
         '--unsigned-apk-path=<(unsigned_apk_path)',
         '--final-apk-path=<(final_apk_path)',
         '--keystore-path=<(keystore_path)',
 
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
       ],
     },
   ],
 }