From 63c65c776da35e0537214b4fe991ead936c65eb9 Mon Sep 17 00:00:00 2001
From: Tianjie Xu <xunchang@google.com>
Date: Thu, 25 Mar 2021 05:00:12 +0000
Subject: [PATCH 1/2] Revert "Nextgen release: Don't build super_empty.img"

Revert submission 1644988-nextgen-release-img-zip-cleanup

Reason for revert: b/183654818
Reverted Changes:
I2474e5fd6:Nextgen release: Don't build super_empty.img
I549439528:Add option to allow product makefiles to skip buil...

Change-Id: I91fb23542f7f70b0c1d6d3dabf97c0844956cfb0
---
 target/product/gsi_release.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index e8f1c2e35c..539dbfa513 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -65,4 +65,3 @@ PRODUCT_BUILD_CACHE_IMAGE := false
 PRODUCT_BUILD_USERDATA_IMAGE := false
 PRODUCT_BUILD_VENDOR_IMAGE := false
 PRODUCT_BUILD_SUPER_PARTITION := false
-PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false

From ccfea17fb70159c4f31768794bd6ed5290b6b90a Mon Sep 17 00:00:00 2001
From: Tianjie Xu <xunchang@google.com>
Date: Thu, 25 Mar 2021 05:00:12 +0000
Subject: [PATCH 2/2] Revert "Add option to allow product makefiles to skip
 building s..."

Revert submission 1644988-nextgen-release-img-zip-cleanup

Reason for revert: b/183654818
Reverted Changes:
I2474e5fd6:Nextgen release: Don't build super_empty.img
I549439528:Add option to allow product makefiles to skip buil...

Change-Id: I711d1c288eed17686b048144d8d41c0fdd5cd8e1
---
 core/Makefile                                 |  9 +++++----
 core/board_config.mk                          | 19 -------------------
 core/product.mk                               |  1 -
 tools/releasetools/add_img_to_target_files.py |  5 ++---
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 7975d3a66c..99df084c1c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4621,8 +4621,6 @@ define dump-dynamic-partitions-info
   echo "lpmake=$(notdir $(LPMAKE))" >> $(1)
   $(if $(filter true,$(PRODUCT_BUILD_SUPER_PARTITION)), $(if $(BOARD_SUPER_PARTITION_SIZE), \
     echo "build_super_partition=true" >> $(1)))
-  $(if $(BUILDING_SUPER_EMPTY_IMAGE), \
-    echo "build_super_empty_partition=true" >> $(1))
   $(if $(filter true,$(BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE)), \
     echo "build_retrofit_dynamic_partitions_ota_package=true" >> $(1))
   echo "super_metadata_device=$(BOARD_SUPER_PARTITION_METADATA_DEVICE)" >> $(1)
@@ -5492,7 +5490,9 @@ endif # PRODUCT_BUILD_SUPER_PARTITION == "true"
 
 # -----------------------------------------------------------------
 # super empty image
-ifdef BUILDING_SUPER_EMPTY_IMAGE
+
+ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))
+ifneq ($(BOARD_SUPER_PARTITION_SIZE),)
 
 INSTALLED_SUPERIMAGE_EMPTY_TARGET := $(PRODUCT_OUT)/super_empty.img
 $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): intermediates := $(call intermediates-dir-for,PACKAGING,super_empty)
@@ -5506,7 +5506,8 @@ $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): $(LPMAKE) $(BUILD_SUPER_IMAGE)
 
 $(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))
 
-endif # BUILDING_SUPER_EMPTY_IMAGE
+endif # BOARD_SUPER_PARTITION_SIZE != ""
+endif # PRODUCT_USE_DYNAMIC_PARTITIONS == "true"
 
 
 # -----------------------------------------------------------------
diff --git a/core/board_config.mk b/core/board_config.mk
index 73b81d63e7..57363fbc76 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -460,25 +460,6 @@ ifeq ($(PRODUCT_BUILD_VBMETA_IMAGE),false)
 endif
 .KATI_READONLY := BUILDING_VBMETA_IMAGE
 
-# Are we building a super_empty image
-BUILDING_SUPER_EMPTY_IMAGE :=
-ifeq ($(PRODUCT_BUILD_SUPER_EMPTY_IMAGE),)
-  ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))
-    ifneq ($(BOARD_SUPER_PARTITION_SIZE),)
-      BUILDING_SUPER_EMPTY_IMAGE := true
-    endif
-  endif
-else ifeq ($(PRODUCT_BUILD_SUPER_EMPTY_IMAGE),true)
-  ifneq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))
-    $(error PRODUCT_BUILD_SUPER_EMPTY_IMAGE set to true, but PRODUCT_USE_DYNAMIC_PARTITIONS is not true)
-  endif
-  ifeq ($(BOARD_SUPER_PARTITION_SIZE),)
-    $(error PRODUCT_BUILD_SUPER_EMPTY_IMAGE set to true, but BOARD_SUPER_PARTITION_SIZE is not defined)
-  endif
-  BUILDING_SUPER_EMPTY_IMAGE := true
-endif
-.KATI_READONLY := BUILDING_SUPER_EMPTY_IMAGE
-
 ###########################################
 # Now we can substitute with the real value of TARGET_COPY_OUT_VENDOR
 ifeq ($(TARGET_COPY_OUT_VENDOR),$(_vendor_path_placeholder))
diff --git a/core/product.mk b/core/product.mk
index 175c62a02e..19e760b736 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -381,7 +381,6 @@ _product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE
 _product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE
 _product_single_value_vars += PRODUCT_BUILD_VENDOR_BOOT_IMAGE
 _product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE
-_product_single_value_vars += PRODUCT_BUILD_SUPER_EMPTY_IMAGE
 
 # List of boot jars delivered via apex
 _product_list_vars += PRODUCT_UPDATABLE_BOOT_JARS
diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 4fe10c6ca1..900c7b5446 100644
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -1027,9 +1027,8 @@ def AddImagesToTargetFiles(filename):
       AddVBMeta(output_zip, partitions, "vbmeta", vbmeta_partitions)
 
   if OPTIONS.info_dict.get("use_dynamic_partitions") == "true":
-    if OPTIONS.info_dict.get("build_super_empty_partition") == "true":
-      banner("super_empty")
-      AddSuperEmpty(output_zip)
+    banner("super_empty")
+    AddSuperEmpty(output_zip)
 
   if OPTIONS.info_dict.get("build_super_partition") == "true":
     if OPTIONS.info_dict.get(