Make generated bin/install_incremental_* script remember its own CHROMIUM_OUTPUT_DIR

BUG=520082

Review URL: https://codereview.chromium.org/1337953002

Cr-Original-Commit-Position: refs/heads/master@{#348620}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b45d19e19fc8bcb9c68be81f1be5549b1ee4f790

android/gn/create_incremental_install_script.py

@@ -54,6 +54,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 +79,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:

android/incremental_install.py

@@ -39,6 +39,8 @@ def main():
                       action='store_true',
                       default=False,
                       help='Remove the app and all side-loaded files.')
+  parser.add_argument('--output-directory',
+                      help='Path to the root build directory.')
   parser.add_argument('--no-threading',
                       action='store_true',
                       default=False,
@@ -55,6 +57,8 @@ def main():
   logging.basicConfig(format='%(asctime)s (%(thread)d) %(message)s')
   run_tests_helper.SetLogLevel(args.verbose_count)
   constants.SetBuildType('Debug')
+  if args.output_directory:
+    constants.SetOutputDirectory(args.output_directory)
 
   if args.device:
     # Retries are annoying when commands fail for legitimate reasons. Might want