Android Add _incremental targets for instrumentation tests

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 a61f980597d6016855fa8d0ffddbfb3a36accd31..c09887a7b3a94f86a6d81b079f186f8cfde75a70 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -216,6 +216,11 @@ def main(argv):
 
   # apk options
   parser.add_option('--apk-path', help='Path to the target\'s apk output.')
+  parser.add_option('--incremental-apk-path',
+                    help='Path to the target\'s incremental apk output.')

[jbudorick, 2016/02/09 23:32:32]

nit: use double quotes around strings containing an apostrophe s.t. you don't
have to escape.

[agrieve, 2016/02/10 01:56:56]

Done.

+  parser.add_option('--incremental-install-script-path',
+                    help='Path to the target\'s generated incremental install '

[jbudorick, 2016/02/09 23:32:32]

nit: same

[agrieve, 2016/02/10 01:56:56]

Done.

+                    'script.')
 
   parser.add_option('--tested-apk-config',
       help='Path to the build config of the tested apk (for an instrumentation '
@@ -343,6 +348,9 @@ def main(argv):
       deps_info['dex_path'] = options.dex_path
     if options.type == 'android_apk':
       deps_info['apk_path'] = options.apk_path
+      deps_info['incremental_apk_path'] = options.incremental_apk_path
+      deps_info['incremental_install_script_path'] = (
+          options.incremental_install_script_path)
 
     # Classpath values filled in below (after applying tested_apk_config).
     config['javac'] = {}
@@ -438,8 +446,6 @@ 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'] = {}