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

2023-08-31 14:30:17 +00:00
parent 7a6468edd5 21ef2c600b
commit c20ef7ca4a
1 changed files with 4 additions and 4 deletions
--- a/tools/releasetools/merge/merge_meta.py
+++ b/tools/releasetools/merge/merge_meta.py
@@ -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(