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

Commit 21ef2c60 authored by Himanshu Jakhmola's avatar Himanshu Jakhmola
Browse files

Avoid calling MergeUpdateEngineConfig for non-ab target 

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
parent 6f09d105

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(