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

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

Issue 1471393002: GN Incremental Install: Don't use proguarded dex when is_debug = false (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add warning Created 5 years, 1 month 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
« no previous file with comments | « build/android/gyp/write_build_config.py ('k') | build/android/incremental_install/installer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/incremental_install/create_install_script.py
diff --git a/build/android/incremental_install/create_install_script.py b/build/android/incremental_install/create_install_script.py
index 5040a5651fbfb0ee3ba1c13551c536b3e7b79bf7..ff8e2c1a1a2659a3de7cb82119e17deb29272524 100755
--- a/build/android/incremental_install/create_install_script.py
+++ b/build/android/incremental_install/create_install_script.py
@@ -40,10 +40,12 @@ def GetInstallParameters():
lib_dir = {lib_dir}
dex_files = {dex_files}
splits = {splits}
+ show_proguard_warning = {show_proguard_warning}
return dict(apk_path=_ResolvePath(apk_path),
dex_files=[_ResolvePath(p) for p in dex_files],
lib_dir=_ResolvePath(lib_dir),
+ show_proguard_warning=show_proguard_warning,
splits=[_ResolvePath(p) for p in splits])
@@ -62,6 +64,8 @@ def main():
for split in params['splits']:
cmd_args.extend(('--split', split))
cmd_args.append(params['apk_path'])
+ if params['show_proguard_warning']:
+ cmd_args.append('--show-proguard-warning')
return subprocess.call(cmd_args + sys.argv[1:])
if __name__ == '__main__':
@@ -97,6 +101,10 @@ def _ParseArgs(args):
help='List of dex files to include.')
parser.add_argument('--dex-file-list',
help='GYP-list of dex files.')
+ parser.add_argument('--show-proguard-warning',
+ action='store_true',
+ default=False,
+ help='Print a warning about proguard being disabled')
options = parser.parse_args(args)
options.dex_files += build_utils.ParseGypList(options.dex_file_list)
@@ -119,6 +127,7 @@ def main(args):
'output_directory': pformat(relativize(options.output_directory)),
'lib_dir': pformat(relativize(options.lib_dir)),
'dex_files': pformat([relativize(p) for p in options.dex_files]),
+ 'show_proguard_warning': pformat(options.show_proguard_warning),
'splits': pformat([relativize(p) for p in options.splits]),
}
« no previous file with comments | « build/android/gyp/write_build_config.py ('k') | build/android/incremental_install/installer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698