StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include META/* in the vendor item list when rebuild-sepolicy" am: 5da012adb0 am: e890d0008c

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

Change-Id: I8600fd1e1a057eb53cc803f29620c7e46c329e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dennis Song
2023-04-15 02:41:26 +00:00
committed by Automerger Merge Worker
parent aca0515f1b e890d0008c
commit 2e63bdb6d0
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/releasetools/merge/merge_target_files.py
View File

@@ -165,6 +165,19 @@ def remove_file_if_exists(file_name):
pass pass
def include_meta_in_list(item_list):
"""Include all `META/*` files in the item list.
To ensure that `AddImagesToTargetFiles` can still be used with vendor item
list that do not specify all of the required META/ files, those files should
be included by default. This preserves the backward compatibility of
`rebuild_image_with_sepolicy`.
"""
if not item_list:
return None
return list(item_list) + ['META/*']
def create_merged_package(temp_dir): def create_merged_package(temp_dir):
"""Merges two target files packages into one target files structure. """Merges two target files packages into one target files structure.
@@ -276,7 +289,7 @@ def rebuild_image_with_sepolicy(target_files_dir):
merge_utils.CollectTargetFiles( merge_utils.CollectTargetFiles(
input_zipfile_or_dir=OPTIONS.vendor_target_files, input_zipfile_or_dir=OPTIONS.vendor_target_files,
output_dir=vendor_target_files_dir, output_dir=vendor_target_files_dir,
item_list=OPTIONS.vendor_item_list) item_list=include_meta_in_list(OPTIONS.vendor_item_list))
# Copy the partition contents from the merged target-files archive to the # Copy the partition contents from the merged target-files archive to the
# vendor target-files archive. # vendor target-files archive.