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

Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-31 14:30:17 +00:00
committed by Gerrit Code Review
parent 7a6468edd5 21ef2c600b
commit c20ef7ca4a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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