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 am: c20ef7ca4a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2653761

Change-Id: I12468fb66e3c0915cbd92723c9206950b9721393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-31 15:31:37 +00:00
committed by Automerger Merge Worker
parent 4f6a32d86f c20ef7ca4a
commit 69c8926522
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(