commit e86bab474b13e3ea4e5eba4138a40d60617c7a82
author Yo Chiang <yochiang@google.com> Thu Mar 25 10:12:28 2021 +0000
committer Yo Chiang <yochiang@google.com> Thu Mar 25 10:12:28 2021 +0000
tree 38efdafde89a3b879b9cb4e2a9493604208e56c0
parent ccfea17fb70159c4f31768794bd6ed5290b6b90a

Revert^2 "Add option to allow product makefiles to skip building s..."

This reverts commit ccfea17fb70159c4f31768794bd6ed5290b6b90a.

Reason for revert: Original bug was resolved by updating branch config

Change-Id: I2327092261a2147fa8f2be3d878db04228e65511

tools/releasetools/add_img_to_target_files.py

diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 900c7b5..4fe10c6 100644
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -1027,8 +1027,9 @@
       AddVBMeta(output_zip, partitions, "vbmeta", vbmeta_partitions)
 
   if OPTIONS.info_dict.get("use_dynamic_partitions") == "true":
-    banner("super_empty")
-    AddSuperEmpty(output_zip)
+    if OPTIONS.info_dict.get("build_super_empty_partition") == "true":
+      banner("super_empty")
+      AddSuperEmpty(output_zip)
 
   if OPTIONS.info_dict.get("build_super_partition") == "true":
     if OPTIONS.info_dict.get(