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

Commit 69c89265 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I12468fb66e3c0915cbd92723c9206950b9721393
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f6a32d8 c20ef7ca

tools/releasetools/merge/merge_meta.py

+4 −4
Original line number Diff line number Diff line
@@ -124,10 +124,10 @@ def MergeMetaFiles(temp_dir, merged_dir): 
        merged_meta_dir=merged_meta_dir,

        file_name=file_name)



  if OPTIONS.merged_misc_info.get('ab_update') == 'true':

    MergeUpdateEngineConfig(

        framework_meta_dir,

      vendor_meta_dir, merged_meta_dir,

  )

        vendor_meta_dir, merged_meta_dir)



  # Write the now-finalized OPTIONS.merged_misc_info.

  merge_utils.WriteSortedData(