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

Filter out ab_partitions in source_info as well

Browse Source 
When generating a incremental partial OTA, we need to filter out
partitions in ab_partitions which are not in partial list

Test: Generate a partial incremental OTA
Change-Id: Iff7748ce6181a9a231557de0539004211587232c
This commit is contained in:
Kelvin Zhang
2020-11-11 13:07:10 -05:00
parent 6f83343e7e
commit 83ea783146
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/releasetools/ota_from_target_files.py
View File

@@ -1254,11 +1254,6 @@ def main(argv):
OPTIONS.info_dict = common.LoadInfoDict(OPTIONS.extracted_input) OPTIONS.info_dict = common.LoadInfoDict(OPTIONS.extracted_input)
else: else:
OPTIONS.info_dict = ParseInfoDict(args[0]) 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: if OPTIONS.downgrade:
# We should only allow downgrading incrementals (as opposed to full). # We should only allow downgrading incrementals (as opposed to full).
@@ -1284,6 +1279,17 @@ def main(argv):
logger.info("--- source info ---") logger.info("--- source info ---")
common.DumpInfoDict(OPTIONS.source_info_dict) 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. # Load OEM dicts if provided.
OPTIONS.oem_dicts = _LoadOemDicts(OPTIONS.oem_source) OPTIONS.oem_dicts = _LoadOemDicts(OPTIONS.oem_source)