diff options
author | Yi-Yo Chiang <yochiang@google.com> | 2022-01-10 09:17:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-10 09:17:11 +0000 |
commit | 91252412acf20d338864dd8d3f05273af33a1816 (patch) | |
tree | ccf45aa02ee21441bf545a26170d871941d2d125 | |
parent | c7d21760d2964abf880582479263f791e9696057 (diff) | |
parent | 388052e43c97e23f3e3076f1473bcfb108e7ff90 (diff) | |
download | mkbootimg-91252412acf20d338864dd8d3f05273af33a1816.tar.gz |
generate_gki_certificate: Support supplying --additional_avb_args multiple times am: 388052e43c
Original change: https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/1941493
Change-Id: Ie00c3389718ae31af33a3c2feb0d043fed5ae872
-rwxr-xr-x | gki/generate_gki_certificate.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gki/generate_gki_certificate.py b/gki/generate_gki_certificate.py index f3802a0..41a858a 100755 --- a/gki/generate_gki_certificate.py +++ b/gki/generate_gki_certificate.py @@ -66,10 +66,17 @@ def parse_cmdline(): parser.add_argument('--avbtool', default='avbtool', help='path to the avbtool executable') parser.add_argument('--salt', help='salt to use when computing image hash') - parser.add_argument('--additional_avb_args', default='', + parser.add_argument('--additional_avb_args', default=[], action='append', help='additional arguments to be forwarded to avbtool') - return parser.parse_args() + args = parser.parse_args() + + additional_avb_args = [] + for a in args.additional_avb_args: + additional_avb_args.extend(a.split()) + args.additional_avb_args = additional_avb_args + + return args def main(): @@ -77,7 +84,7 @@ def main(): generate_gki_certificate( image=args.image, avbtool=args.avbtool, name=args.name, algorithm=args.algorithm, key=args.key, salt=args.salt, - additional_avb_args=args.additional_avb_args.split(), + additional_avb_args=args.additional_avb_args, output=args.output, ) |