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

Merge "Fix merge_target_files in GRF case" am: b3adc24301

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

Change-Id: I564bb6d43bfa5b9cb79463f0ba50038d03ef6abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-25 11:37:45 +00:00 committed by Automerger Merge Worker
commit 592ad2cb13
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,17 +165,24 @@ def remove_file_if_exists(file_name):
pass pass
def include_meta_in_list(item_list): def include_extra_in_list(item_list):
"""Include all `META/*` files in the item list. """
1. Include all `META/*` files in the item list.
To ensure that `AddImagesToTargetFiles` can still be used with vendor item 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 list that do not specify all of the required META/ files, those files should
be included by default. This preserves the backward compatibility of be included by default. This preserves the backward compatibility of
`rebuild_image_with_sepolicy`. `rebuild_image_with_sepolicy`.
2. Include `SYSTEM/build.prop` file in the item list.
To ensure that `AddImagesToTargetFiles` for GRF vendor images, can still
access SYSTEM/build.prop to pass GetPartitionFingerprint check in BuildInfo
constructor.
""" """
if not item_list: if not item_list:
return None return None
return list(item_list) + ['META/*'] return list(item_list) + ['META/*'] + ['SYSTEM/build.prop']
def create_merged_package(temp_dir): def create_merged_package(temp_dir):
@ -289,7 +296,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=include_meta_in_list(OPTIONS.vendor_item_list)) item_list=include_extra_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.