Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2834)

Unified Diff: build/android/incremental_install/create_install_script.py

Issue 1338813003: GN: Side-load dex files as well as native code in incremental installs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix pylint warnings Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/android/incremental_install/create_install_script.py
diff --git a/build/android/gn/create_incremental_install_script.py b/build/android/incremental_install/create_install_script.py
similarity index 69%
rename from build/android/gn/create_incremental_install_script.py
rename to build/android/incremental_install/create_install_script.py
index dd9e0d6cc77e43d6306f891a8872368ee88c6fc7..614cbb77c45ead4339bba964015ad0a8937aa3bf 100755
--- a/build/android/gn/create_incremental_install_script.py
+++ b/build/android/incremental_install/create_install_script.py
@@ -4,23 +4,25 @@
# 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."""
+"""Creates a script to run an "_incremental" .apk."""
import argparse
import os
+import pprint
import sys
sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'gyp'))
-from util import build_utils
+
from pylib import constants
+from util import build_utils
SCRIPT_TEMPLATE = """\
#!/usr/bin/env python
#
# This file was generated by:
-# //build/android/gyp/create_incremental_install_script.py
+# //build/android/incremental_install/create_install_script.py
import os
import subprocess
@@ -47,7 +49,7 @@ if __name__ == '__main__':
"""
-def main(args):
+def _ParseArgs(args):
args = build_utils.ExpandFileArgs(args)
parser = argparse.ArgumentParser()
build_utils.AddDepfileOption(parser)
@@ -68,31 +70,49 @@ def main(args):
'Can be specified multiple times.')
parser.add_argument('--lib-dir',
help='Path to native libraries directory.')
+ parser.add_argument('--dex-file',
+ action='append',
+ default=[],
+ dest='dex_files',
+ help='List of dex files to include.')
+ parser.add_argument('--dex-file-list',
+ help='GYP-list of dex files.')
options = parser.parse_args(args)
+ options.dex_files += build_utils.ParseGypList(options.dex_file_list)
+ return options
+
+
+def main(args):
+ options = _ParseArgs(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)
+ installer_path = os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'android',
+ 'incremental_install', 'installer.py')
+ installer_path = relativize(installer_path)
- incremental_install_path_args = [
+ 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)))
+ path_args.append(('--lib-dir', relativize(options.lib_dir)))
+
+ if options.dex_files:
+ for dex_file in options.dex_files:
+ path_args.append(('--dex-file', relativize(dex_file)))
+
for split_arg in options.splits:
- incremental_install_path_args.append(('--split', relativize(split_arg)))
+ 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_path=pprint.pformat(installer_path),
cmd_args='[]',
- cmd_path_args=repr(incremental_install_path_args)))
+ cmd_path_args=pprint.pformat(path_args)))
os.chmod(options.script_output_path, 0750)

Powered by Google App Engine
This is Rietveld 408576698