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

Merge "Respect framework partition set while merging meta files" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-09-15 17:52:17 +00:00 committed by Gerrit Code Review
commit b25e443bc5
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/releasetools/merge/merge_meta.py
View file

@ -53,8 +53,6 @@ PARTITION_TAG_PATTERN = re.compile(r'partition="(.*?)"')
MODULE_KEY_PATTERN = re.compile(r'name="(.+)\.(apex|apk)"')
def MergeUpdateEngineConfig(input_metadir1, input_metadir2, merged_meta_dir):
UPDATE_ENGINE_CONFIG_NAME = "update_engine_config.txt"
config1_path = os.path.join(
@ -74,7 +72,7 @@ def MergeUpdateEngineConfig(input_metadir1, input_metadir2, merged_meta_dir):
merged_meta_dir, UPDATE_ENGINE_CONFIG_NAME))
def MergeMetaFiles(temp_dir, merged_dir):
def MergeMetaFiles(temp_dir, merged_dir, framework_partitions):
"""Merges various files in META/*."""
framework_meta_dir = os.path.join(temp_dir, 'framework_meta', 'META')
@ -114,7 +112,8 @@ def MergeMetaFiles(temp_dir, merged_dir):
MergeAbPartitions(
framework_meta_dir=framework_meta_dir,
vendor_meta_dir=vendor_meta_dir,
merged_meta_dir=merged_meta_dir)
merged_meta_dir=merged_meta_dir,
framework_partitions=framework_partitions)
UpdateCareMapImageSizeProps(images_dir=os.path.join(merged_dir, 'IMAGES'))
for file_name in ('apkcerts.txt', 'apexkeys.txt'):
@ -135,13 +134,22 @@ def MergeMetaFiles(temp_dir, merged_dir):
path=os.path.join(merged_meta_dir, 'misc_info.txt'))
def MergeAbPartitions(framework_meta_dir, vendor_meta_dir, merged_meta_dir):
def MergeAbPartitions(framework_meta_dir, vendor_meta_dir, merged_meta_dir,
framework_partitions):
"""Merges META/ab_partitions.txt.
The output contains the union of the partition names.
"""
with open(os.path.join(framework_meta_dir, 'ab_partitions.txt')) as f:
framework_ab_partitions = f.read().splitlines()
# Filter out some partitions here to support the case that the
# ab_partitions.txt of framework-target-files has non-framework partitions.
# This case happens when we use a complete merged target files package as
# the framework-target-files.
framework_ab_partitions = [
partition
for partition in f.read().splitlines()
if partition in framework_partitions
]
with open(os.path.join(vendor_meta_dir, 'ab_partitions.txt')) as f:
vendor_ab_partitions = f.read().splitlines()

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

@ -209,7 +209,9 @@ def create_merged_package(temp_dir):
# After this function completes successfully, all the files we need to create
# the output target files package are in place.
merge_meta.MergeMetaFiles(
temp_dir=temp_dir, merged_dir=output_target_files_temp_dir)
temp_dir=temp_dir,
merged_dir=output_target_files_temp_dir,
framework_partitions=OPTIONS.framework_partition_set)
merge_dexopt.MergeDexopt(
temp_dir=temp_dir, output_target_files_dir=output_target_files_temp_dir)