Use java_apk.gypi for gtest apks

build/apk_test.gypi

Index: build/apk_test.gypi
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 71577a1b8a0132d758599498ab3d689a202fd530..de426f40137901bbc247e0a6dfeb1b451a754561 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -24,67 +24,59 @@
     '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
   ],
   'variables': {
-    'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk/',
-    'generate_native_test_stamp': '<(intermediate_dir)/generate_native_test.stamp',
+    'generator_intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk/generated/',
+    'generate_native_test_stamp': '<(generator_intermediate_dir)/generate_native_test.stamp',
   },
-  'target_conditions': [
-    ['_toolset == "target"', {
-      'conditions': [
-        ['OS == "android" and gtest_target_type == "shared_library"', {
-          'actions': [{
-            'action_name': 'apk_<(test_suite_name)',
-            'message': 'Building <(test_suite_name) test apk.',
-            'inputs': [
-              '<(DEPTH)/testing/android/AndroidManifest.xml',
-              '<(DEPTH)/testing/android/generate_native_test.py',
-              '<(input_shlib_path)',
-              '>@(input_jars_paths)',
-            ],
-            'outputs': [
-              '<(generate_native_test_stamp)',
-            ],
-            'action': [
-              '<(DEPTH)/testing/android/generate_native_test.py',
-              '--native_library',
-              '<(input_shlib_path)',
-              '--output',
-              '<(intermediate_dir)',
-              '--strip-binary=<(android_strip)',
-              '--app_abi',
-              '<(android_app_abi)',
-              '--stamp-file',
-              '<(generate_native_test_stamp)',
-              '--no-compile',
-            ],
-          },
-          {
-            'action_name': 'ant_apk_<(test_suite_name)',
-            'message': 'Building <(test_suite_name) test apk.',
-            'inputs': [
-              '<(DEPTH)/build/android/gyp/util/build_utils.py',
-              '<(DEPTH)/build/android/gyp/ant.py',
-              '<(generate_native_test_stamp)',
-            ],
-            'outputs': [
-              '<(PRODUCT_DIR)/<(test_suite_name)_apk/<(test_suite_name)-debug.apk',
-            ],
-            'action': [
-              'python', '<(DEPTH)/build/android/gyp/ant.py',
-              '-quiet',
-              '-DPRODUCT_DIR=<(ant_build_out)',
-              '-DANDROID_SDK=<(android_sdk)',
-              '-DANDROID_SDK_ROOT=<(android_sdk_root)',
-              '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
-              '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-              '-DANDROID_GDBSERVER=<(android_gdbserver)',
-              '-DCHROMIUM_SRC=<(ant_build_out)/../..',
-              '-DINPUT_JARS_PATHS=>(input_jars_paths)',
-              '-DAPP_ABI=<(android_app_abi)',
-              '-buildfile', '<(intermediate_dir)/native_test_apk.xml',
-            ],
-          }],
-        }],  # 'OS == "android" and gtest_target_type == "shared_library"
-      ],  # conditions
-    }],
-  ],  # target_conditions
+  'conditions': [
+     ['OS == "android" and gtest_target_type == "shared_library"', {
+       'variables': {
+         # These are used to configure java_apk.gypi included below.
+         'apk_name': '<(test_suite_name)',
+         'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',
+         'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',
+         'java_in_dir': '<(DEPTH)/build/android/empty',
+         'android_manifest_path': '<(generator_intermediate_dir)/AndroidManifest.xml',
+         'native_lib_target': 'lib<(test_suite_name)',
+         'generated_src_dirs': [
+           '<(generator_intermediate_dir)/java',
+         ],
+         'additional_input_paths': [
+           '<(generate_native_test_stamp)',
+         ],
+         'additional_res_dirs': [
+           '<(generator_intermediate_dir)/res',
+         ],
+       },
+       'actions': [
+         {
+           'action_name': 'apk_<(test_suite_name)',
+           'message': 'Building <(test_suite_name) test apk.',
+           'inputs': [
+             '<(DEPTH)/testing/android/AndroidManifest.xml',
+             '<(DEPTH)/testing/android/generate_native_test.py',
+             '<(input_shlib_path)',
+             '>@(input_jars_paths)',
+           ],
+           'outputs': [
+             '<(generate_native_test_stamp)',
+             '<(android_manifest_path)',
+           ],
+           'action': [
+             '<(DEPTH)/testing/android/generate_native_test.py',
+             '--native_library',
+             '<(input_shlib_path)',
+             '--output',
+             '<(generator_intermediate_dir)',
+             '--strip-binary=<(android_strip)',
+             '--app_abi',
+             '<(android_app_abi)',
+             '--stamp-file',
+             '<(generate_native_test_stamp)',
+             '--no-compile',
+           ],
+         },
+       ],
+       'includes': [ 'java_apk.gypi' ],
+     }],  # 'OS == "android" and gtest_target_type == "shared_library"
+  ],  # conditions
 }