tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Support to merge PREBUILT_IMAGES" am: dd62b0da0f am: 5939a80763 am: c42fcf9acd

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512522

Change-Id: I3ad19fd878f5da9131ec76944a90022633d69c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-04-25 07:23:35 +00:00 committed by Automerger Merge Worker
commit f56f8e3d0d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/releasetools/merge/merge_utils.py
View file

@ -181,6 +181,7 @@ def ValidateConfigLists():
_PARTITION_ITEM_PATTERN = re.compile(r'^([A-Z_]+)/.*$')
_IMAGE_PARTITION_PATTERN = re.compile(r'^IMAGES/(.*)\.img$')
_PREBUILT_IMAGE_PARTITION_PATTERN = re.compile(r'^PREBUILT_IMAGES/(.*)\.img$')
def ItemListToPartitionSet(item_list):
@ -203,12 +204,12 @@ def ItemListToPartitionSet(item_list):
partition_set = set()
for item in item_list:
for pattern in (_PARTITION_ITEM_PATTERN, _IMAGE_PARTITION_PATTERN):
for pattern in (_PARTITION_ITEM_PATTERN, _IMAGE_PARTITION_PATTERN, _PREBUILT_IMAGE_PARTITION_PATTERN):
partition_match = pattern.search(item.strip())
if partition_match:
partition = partition_match.group(1).lower()
# These directories in target-files are not actual partitions.
if partition not in ('meta', 'images'):
if partition not in ('meta', 'images', 'prebuilt_images'):
partition_set.add(partition)
return partition_set
@ -217,7 +218,7 @@ def ItemListToPartitionSet(item_list):
# Partitions that are grabbed from the framework partial build by default.
_FRAMEWORK_PARTITIONS = {
'system', 'product', 'system_ext', 'system_other', 'root', 'system_dlkm',
'vbmeta_system'
'vbmeta_system', 'pvmfw'
}
@ -253,7 +254,7 @@ def InferItemList(input_namelist, framework):
if partition == 'meta':
continue
if partition == 'images':
if partition in ('images', 'prebuilt_images'):
image_partition, extension = os.path.splitext(os.path.basename(namelist))
if image_partition == 'vbmeta':
# Always regenerate vbmeta.img since it depends on hash information