Make generated bin/install_incremental_* script remember its own CHROMIUM_OUTPUT_DIR

build/android/gn/create_incremental_install_script.py

 #!/usr/bin/env python
 
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Creates a script to run a "_incremental" .apk."""
 
 import argparse
 import os
@@ skipping 22 matching lines @@
     return os.path.abspath(os.path.join(script_directory, path))
 
   cmd_path = resolve_path({cmd_path})
   cmd_args = [cmd_path] + {cmd_args}
   cmd_path_args = {cmd_path_args}
   for arg, path in cmd_path_args:
     if arg:
       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__':
   sys.exit(main())
 """
 
 
 def main(args):
   args = build_utils.ExpandFileArgs(args)
   parser = argparse.ArgumentParser()
   build_utils.AddDepfileOption(parser)
   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)
   parser.add_argument('--split',
                       action='append',
                       dest='splits',
                       default=[],
                       help='A glob matching the apk splits. '
                            'Can be specified multiple times.')
   parser.add_argument('--lib-dir',
                       help='Path to native libraries directory.')
 
   options = parser.parse_args(args)
 
   def relativize(path):
     return os.path.relpath(path, os.path.dirname(options.script_output_path))
 
   incremental_install_path = os.path.join(constants.DIR_SOURCE_ROOT, 'build',
                                           'android', 'incremental_install.py')
   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:
       incremental_install_path_args.append(
           ('--lib-dir', relativize(options.lib_dir)))
   for split_arg in options.splits:
     incremental_install_path_args.append(('--split', relativize(split_arg)))
 
   with open(options.script_output_path, 'w') as script:
     script.write(SCRIPT_TEMPLATE.format(
         cmd_path=repr(incremental_install_path),
         cmd_args='[]',
         cmd_path_args=repr(incremental_install_path_args)))
 
   os.chmod(options.script_output_path, 0750)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))