diff options
author | Mårten Kongstad <amhk@google.com> | 2022-04-28 15:39:40 +0000 |
---|---|---|
committer | Mårten Kongstad <amhk@google.com> | 2022-04-29 12:18:46 +0000 |
commit | 02cd47462d932df40dbbdf13eedb896a73763544 (patch) | |
tree | 8e3c8012ba63346cad4da433143a317b08c41a26 | |
parent | 2df16dffc04c1729d780129c53cfbb7e417276e6 (diff) | |
download | sdk-02cd47462d932df40dbbdf13eedb896a73763544.tar.gz |
update_prebuilts.py: call finalize_sdk.py --readme
Teach update_prebuilts.py to call finalize_sdk.py with the newly added
--readme argument.
Test: manual: run update_prebuilts.py
Change-Id: Ia8a63b20d891a4aa321288305a22b9cbc3e5d4b8
-rwxr-xr-x | update_prebuilts/update_prebuilts.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py index 9b183ebbe..626a4ec83 100755 --- a/update_prebuilts/update_prebuilts.py +++ b/update_prebuilts/update_prebuilts.py @@ -13,6 +13,7 @@ from functools import reduce from pathlib import Path import six import urllib.request, urllib.parse, urllib.error +import shlex current_path = 'current' framework_sdk_target = 'sdk_phone_armv7-win_sdk' @@ -22,7 +23,7 @@ extras_dir = os.path.join(current_path, 'extras') buildtools_dir = 'tools' jetifier_dir = os.path.join(buildtools_dir, 'jetifier', 'jetifier-standalone') repo_root_dir = Path(sys.argv[0]).resolve().parents[3] -extension_sdk_finalization_cmd = '%s -b {bug} -f {extension_version} {build_id}' % ( +extension_sdk_finalization_cmd = '%s -r "{readme}" -b {bug} -f {extension_version} {build_id}' % ( "packages/modules/common/tools/finalize_sdk.py" ) temp_dir = os.path.join(os.getcwd(), "support_tmp") @@ -979,11 +980,13 @@ try: subprocess.check_call(['git', 'commit', '-m', msg]) # Finalize extension sdk level + readme = f"- {args.finalize_extension}: Finalized together with Android {args.finalize_sdk} (all modules)" cmd = extension_sdk_finalization_cmd.format( + readme=readme, bug=args.bug, extension_version=args.finalize_extension, build_id=getBuildId(args).url_id) - subprocess.check_call(cmd.split(' '), cwd=repo_root_dir.resolve()) + subprocess.check_call(shlex.split(cmd), cwd=repo_root_dir.resolve()) if args.material: if update_material(getFile(args)): components = append(components, 'intermediate-AndroidX Design Library') |