Merge "Add --max_threads to OTA generation" into udc-dev am: b87d46cb1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23286093
Change-Id: I5993793c15db511ece7528d6a71696e1bb725e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 2d49288..e40256c 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -248,6 +248,9 @@
--security_patch_level
Override the security patch level in target files
+
+ --max_threads
+ Specify max number of threads allowed when generating A/B OTA
"""
from __future__ import print_function
@@ -321,6 +324,8 @@
OPTIONS.enable_lz4diff = False
OPTIONS.vabc_compression_param = None
OPTIONS.security_patch_level = None
+OPTIONS.max_threads = None
+
POSTINSTALL_CONFIG = 'META/postinstall_config.txt'
DYNAMIC_PARTITION_INFO = 'META/dynamic_partitions_info.txt'
@@ -985,6 +990,9 @@
additional_args += ["--security_patch_level", security_patch_level]
+ if OPTIONS.max_threads:
+ additional_args += ["--max_threads", OPTIONS.max_threads]
+
additional_args += ["--enable_zucchini=" +
str(OPTIONS.enable_zucchini).lower()]
@@ -1191,6 +1199,12 @@
OPTIONS.vabc_compression_param = a.lower()
elif o == "--security_patch_level":
OPTIONS.security_patch_level = a
+ elif o in ("--max_threads"):
+ if a.isdigit():
+ OPTIONS.max_threads = a
+ else:
+ raise ValueError("Cannot parse value %r for option %r - only "
+ "integers are allowed." % (a, o))
else:
return False
return True
@@ -1242,6 +1256,7 @@
"enable_lz4diff=",
"vabc_compression_param=",
"security_patch_level=",
+ "max_threads=",
], extra_option_handler=option_handler)
common.InitLogging()