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

Commit 13285b72 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Filter out ab_partitions in source_info as well" am: cd4e7c02 

Original change: https://android-review.googlesource.com/c/platform/build/+/1496817

Change-Id: I6d40f7c5f5ec698e4b240a80a1dc6e3f6948b331
parents 15647823 cd4e7c02

tools/releasetools/ota_from_target_files.py

+11 −5
Original line number Diff line number Diff line
@@ -1254,11 +1254,6 @@ def main(argv): 
    OPTIONS.info_dict = common.LoadInfoDict(OPTIONS.extracted_input)

  else:

    OPTIONS.info_dict = ParseInfoDict(args[0])

  if OPTIONS.partial:

    OPTIONS.info_dict['ab_partitions'] = \

      list(

        set(OPTIONS.info_dict['ab_partitions']) & set(OPTIONS.partial)

        )



  if OPTIONS.downgrade:

    # We should only allow downgrading incrementals (as opposed to full).
@@ -1284,6 +1279,17 @@ def main(argv): 
    logger.info("--- source info ---")

    common.DumpInfoDict(OPTIONS.source_info_dict)



  if OPTIONS.partial:

    OPTIONS.info_dict['ab_partitions'] = \

      list(

        set(OPTIONS.info_dict['ab_partitions']) & set(OPTIONS.partial)

        )

    if OPTIONS.source_info_dict:

      OPTIONS.source_info_dict['ab_partitions'] = \

        list(

          set(OPTIONS.source_info_dict['ab_partitions']) & set(OPTIONS.partial)

          )



  # Load OEM dicts if provided.

  OPTIONS.oem_dicts = _LoadOemDicts(OPTIONS.oem_source)