Make generated bin/install_incremental_* script remember its own CHROMIUM_OUTPUT_DIR

build/android/gn/create_incremental_install_script.py

Index: build/android/gn/create_incremental_install_script.py
diff --git a/build/android/gn/create_incremental_install_script.py b/build/android/gn/create_incremental_install_script.py
index f12f9e5dc3d594156a57ccd127efc52b3e4e4f16..5c76caacb40b5354285ae04ae63e01c786ffe88b 100755
--- a/build/android/gn/create_incremental_install_script.py
+++ b/build/android/gn/create_incremental_install_script.py
@@ -40,6 +40,7 @@ def main():
       cmd_args.append(arg)
     cmd_args.append(resolve_path(path))
 
+  os.environ['CHROMIUM_OUTPUT_DIR'] = resolve_path(os.pardir)

[jbudorick, 2015/09/11 16:47:53]

Does it work without this? If so, take this out. If not, why?

[agrieve, 2015/09/11 19:58:55]

Whoops, yep, that should not be there.

   return subprocess.call(cmd_args + sys.argv[1:])
 
 if __name__ == '__main__':
@@ -54,6 +55,9 @@ def main(args):
   parser.add_argument('--script-output-path',
                       help='Output path for executable script.',
                       required=True)
+  parser.add_argument('--output-directory',
+                      help='Path to the root build directory.',
+                      default='.')
   parser.add_argument('--apk-path',
                       help='Path to the .apk to install.',
                       required=True)
@@ -76,6 +80,7 @@ def main(args):
   incremental_install_path = relativize(incremental_install_path)
 
   incremental_install_path_args = [
+      ('--output-directory', relativize(options.output_directory)),
       (None, relativize(options.apk_path)),
   ]
   if options.lib_dir: