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

Avoid calling MergeUpdateEngineConfig for non-ab target

Browse Source 
super image generation is failing for non-ab target as it is not able to find update_engine_config.txt while calling MergeUpdateEngineConfig.

META/update_engine_config.txt exists when AB_OTA_UPDATER is true.
Avoid calling MergeUpdateEngineConfig for non-ab target.

Bug: 290811619
Change-Id: Ie88b31adce15df87f73031e1f5bff0d825601e0c
This commit is contained in:
Himanshu Jakhmola
2023-07-12 08:11:12 +05:30
parent 6f09d105ef
commit 21ef2c600b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/merge/merge_meta.py
View File

@@ -124,10 +124,10 @@ def MergeMetaFiles(temp_dir, merged_dir):
merged_meta_dir=merged_meta_dir,
file_name=file_name)
MergeUpdateEngineConfig(
framework_meta_dir,
vendor_meta_dir, merged_meta_dir,
)
if OPTIONS.merged_misc_info.get('ab_update') == 'true':
MergeUpdateEngineConfig(
framework_meta_dir,
vendor_meta_dir, merged_meta_dir)
# Write the now-finalized OPTIONS.merged_misc_info.
merge_utils.WriteSortedData(