Update some gyp targets to use dex_action.gypi

This makes the way that we invoke dex more consistent (and easier to
change).

Review URL: https://codereview.chromium.org/317423003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276518 0039d316-1c4b-4281-b951-d872f2087c98

build/java_prebuilt.gypi

@@ -81,21 +81,13 @@
     {
       'action_name': 'dex_<(_target_name)',
       'message': 'Dexing <(_target_name) jar',
-      'inputs': [
-        '<(DEPTH)/build/android/gyp/util/build_utils.py',
-        '<(DEPTH)/build/android/gyp/dex.py',
-        '<(dex_input_jar_path)',
-      ],
-      'outputs': [
-        '<(dex_path)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/build/android/gyp/dex.py',
-        '--dex-path=<(dex_path)',
-        '--android-sdk-tools=<(android_sdk_tools)',
-        '<(dex_input_jar_path)',
-      ]
+      'variables': {
+        'dex_input_paths': [
+          '<(dex_input_jar_path)',
+        ],
+        'output_path': '<(dex_path)',
+      },
+      'includes': [ 'android/dex_action.gypi' ],
     },
-
   ],
 }

build/uiautomator_test.gypi

@@ -24,20 +24,13 @@
     {
       'action_name': 'dex_<(_target_name)',
       'message': 'Dexing <(_target_name) jar',
-      'inputs': [
-        '<(DEPTH)/build/android/gyp/util/build_utils.py',
-        '<(DEPTH)/build/android/gyp/dex.py',
-        '>@(library_dexed_jars_paths)',
-      ],
-      'outputs': [
-        '<(output_dex_path)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/build/android/gyp/dex.py',
-        '--dex-path=<(output_dex_path)',
-        '--android-sdk-tools=<(android_sdk_tools)',
-        '>@(library_dexed_jars_paths)',
-      ],
+      'variables': {
+        'dex_input_paths': [
+          '>@(library_dexed_jars_paths)',
+        ],
+        'output_path': '<(output_dex_path)',
+      },
+      'includes': [ 'android/dex_action.gypi' ],
     },
   ],
 }