Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36ce326f authored by Dennis Song's avatar Dennis Song
Browse files

Respect framework partition set while merging meta files 

The framework_partition_set would be generated from
framework_item_list and we should respect this partition
set while merging META/ab_partitions.txt.

This is to handle the case when we use a complete merged
target files package as the framework-target-files, where
its ab_partitions.txt may have non-framework partitions.
So we need to filter them out to prevent from the merged
meta file has some partitions that don't exist.

Test: merge_target_files &&
        add_img_to_target_files &&
	img_from_target_files &&
	flash device
Bug: 300193612
Change-Id: I0a76d706a20dcaffa2533278db7383563f03ec02
parent 91646be0

tools/releasetools/merge/merge_meta.py

+14 −6
Original line number Original line Diff line number Diff line
@@ -53,8 +53,6 @@ PARTITION_TAG_PATTERN = re.compile(r'partition="(.*?)"') 
MODULE_KEY_PATTERN = re.compile(r'name="(.+)\.(apex|apk)"')

MODULE_KEY_PATTERN = re.compile(r'name="(.+)\.(apex|apk)"')













def MergeUpdateEngineConfig(input_metadir1, input_metadir2, merged_meta_dir):

def MergeUpdateEngineConfig(input_metadir1, input_metadir2, merged_meta_dir):

  UPDATE_ENGINE_CONFIG_NAME = "update_engine_config.txt"

  UPDATE_ENGINE_CONFIG_NAME = "update_engine_config.txt"

  config1_path = os.path.join(

  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))

        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/*."""

  """Merges various files in META/*."""





  framework_meta_dir = os.path.join(temp_dir, 'framework_meta', 'META')

  framework_meta_dir = os.path.join(temp_dir, 'framework_meta', 'META')
@@ -114,7 +112,8 @@ def MergeMetaFiles(temp_dir, merged_dir): 
    MergeAbPartitions(

    MergeAbPartitions(

        framework_meta_dir=framework_meta_dir,

        framework_meta_dir=framework_meta_dir,

        vendor_meta_dir=vendor_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'))

    UpdateCareMapImageSizeProps(images_dir=os.path.join(merged_dir, 'IMAGES'))





  for file_name in ('apkcerts.txt', 'apexkeys.txt'):

  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'))

      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.

  """Merges META/ab_partitions.txt.





  The output contains the union of the partition names.

  The output contains the union of the partition names.

  """

  """

  with open(os.path.join(framework_meta_dir, 'ab_partitions.txt')) as f:

  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:

  with open(os.path.join(vendor_meta_dir, 'ab_partitions.txt')) as f:

    vendor_ab_partitions = f.read().splitlines()

    vendor_ab_partitions = f.read().splitlines()

tools/releasetools/merge/merge_target_files.py

+3 −1
Original line number Original line Diff line number Diff line
@@ -209,7 +209,9 @@ def create_merged_package(temp_dir): 
  # After this function completes successfully, all the files we need to create

  # After this function completes successfully, all the files we need to create

  # the output target files package are in place.

  # the output target files package are in place.

  merge_meta.MergeMetaFiles(

  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(

  merge_dexopt.MergeDexopt(

      temp_dir=temp_dir, output_target_files_dir=output_target_files_temp_dir)

      temp_dir=temp_dir, output_target_files_dir=output_target_files_temp_dir)