[Android] Make generated test scripts pass apk paths.

build/android/gyp/write_build_config.py

Index: build/android/gyp/write_build_config.py
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 541efdae669e062184b1bc0d48a1470cf64eaff7..625107f5dcdc643fcd8abc8e9242080eb545c223 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -189,6 +189,9 @@ def main(argv):
   parser.add_option('--native-libs', help='List of top-level native libs.')
   parser.add_option('--readelf-path', help='Path to toolchain\'s readelf.')
 
+  # apk options
+  parser.add_option('--apk-path', help='Path to the target\'s apk output.')
+
   parser.add_option('--tested-apk-config',
       help='Path to the build config of the tested apk (for an instrumentation '
       'test apk).')
@@ -291,6 +294,8 @@ def main(argv):
     deps_info['jar_path'] = options.jar_path
     if options.type == 'android_apk' or options.supports_android:
       deps_info['dex_path'] = options.dex_path
+    if options.type == 'android_apk':
+      deps_info['apk_path'] = options.apk_path
     config['javac'] = {
       'classpath': javac_classpath,
     }
@@ -384,6 +389,8 @@ def main(argv):
           ' apks if it\'s enabled for the tested apk')
       proguard_config['tested_apk_info'] = tested_apk_config['proguard_info']
 
+    deps_info['tested_apk_path'] = tested_apk_config['apk_path']
+
   # Dependencies for the final dex file of an apk or a 'deps_dex'.
   if options.type in ['android_apk', 'deps_dex']:
     config['final_dex'] = {}