Use java_apk.gypi for gtest apks

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index af6046e8383ac815452262686315c7f3f99848ce..eb53d4ceb02a89e8f05fe14b052f7b82d9534b0f 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -64,6 +64,7 @@
     'jar_name': 'chromium_apk_<(_target_name).jar',
     'resource_dir%':'<(DEPTH)/build/android/ant/empty/res',
     'R_package%':'',
+    'additional_R_text_files': [],
     'additional_res_dirs': [],
     'additional_res_packages': [],
     'is_test_apk%': 0,
@@ -96,11 +97,12 @@
     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     'obfuscated_jar_path': '<(intermediate_dir)/obfuscated.jar',
     'dex_path': '<(intermediate_dir)/classes.dex',
-    'android_manifest': '<(java_in_dir)/AndroidManifest.xml',
+    'android_manifest_path%': '<(java_in_dir)/AndroidManifest.xml',
     'push_stamp': '<(intermediate_dir)/push.stamp',
     'link_stamp': '<(intermediate_dir)/link.stamp',
     'codegen_input_paths': [],
-    'final_apk_path': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
+    'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
+    'source_dir': '<(java_in_dir)/src',
     'apk_install_stamp': '<(intermediate_dir)/apk_install.stamp',
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
@@ -334,7 +336,7 @@
       ],
       'inputs': [
         '<(DEPTH)/build/android/ant/apk-codegen.xml',
-        '<(android_manifest)',
+        '<(android_manifest_path)',
         '>@(library_manifest_paths)'
         '>@(codegen_input_paths)',
         '>@(additional_input_paths)',
@@ -347,7 +349,7 @@
         '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
         '-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
         '-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',
-        '-DANDROID_MANIFEST=<(android_manifest)',
+        '-DANDROID_MANIFEST=<(android_manifest_path)',
         '-DANDROID_SDK_JAR=<(android_sdk_jar)',
         '-DANDROID_SDK_ROOT=<(android_sdk_root)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
@@ -537,16 +539,16 @@
         '-DANDROID_SDK_JAR=<(android_sdk_jar)',
         '-DANDROID_SDK_ROOT=<(android_sdk_root)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-        '-DAPKS_DIR=<(PRODUCT_DIR)/apks',
         '-DAPK_NAME=<(apk_name)',
         '-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)',
         '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',
         '-DASSET_DIR=<(asset_location)',
         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
+        '-DFINAL_APK_PATH=<(final_apk_path)',
         '-DKEYSTORE_PATH=<(DEPTH)/build/android/ant/chromium-debug.keystore',
         '-DOUT_DIR=<(intermediate_dir)',
         '-DRESOURCE_DIR=<(resource_dir)',
-        '-DSOURCE_DIR=<(java_in_dir)/src',
+        '-DSOURCE_DIR=<(source_dir)',
 
         '-Dbasedir=.',
         '-buildfile',