generate_extra_images.mk: Reduce TARGET_NO_KERNEL breadth

TARGET_NO_KERNEL currently guards generation of more images than just boot.img. The other images, such as persist and ramdisk are now guarded by more appropriate individual flags. Reduce the impact of TARGET_NO_KERNEL so that a BOARD_PREBUILT_BOOTIMAGE can be used while still generating persist and ramdisk. Change-Id: I08f274af62935b6dc5492c230ee517f5655c3c4d Signed-off-by: chrisl7 <[email protected]>
AOSPA · May 14, 2023 · 9563ab6 · 9563ab6
1 parent 329ee1e
commit 9563ab6
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/generate_extra_images.mk b/generate_extra_images.mk
@@ -20,6 +20,8 @@ INSTALLED_BOOTIMAGE_TARGET := $(BUILT_BOOTIMAGE_TARGET)
 ifeq ($(PRODUCT_BUILD_RAMDISK_IMAGE),true)
 INSTALLED_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
 endif
+endif
+
 ifeq ($(PRODUCT_BUILD_SYSTEM_IMAGE),true)
 INSTALLED_SYSTEMIMAGE := $(PRODUCT_OUT)/system.img
 endif
@@ -33,13 +35,11 @@ INSTALLED_RECOVERYIMAGE_TARGET :=
 endif
 recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img
 INSTALLED_USBIMAGE_TARGET := $(PRODUCT_OUT)/usbdisk.img
-endif
 
 #----------------------------------------------------------------------
 # Generate persist image (persist.img)
 #----------------------------------------------------------------------
 ifneq ($(strip $(BOARD_PERSISTIMAGE_PARTITION_SIZE)),)
-ifneq ($(strip $(TARGET_NO_KERNEL)),true)
 
 TARGET_OUT_PERSIST := $(PRODUCT_OUT)/persist
 
@@ -67,7 +67,6 @@ droidcore-unbundled: $(INSTALLED_PERSISTIMAGE_TARGET)
 .PHONY: persistimage
 persistimage: $(INSTALLED_PERSISTIMAGE_TARGET)
 
-endif
 endif
 
 #----------------------------------------------------------------------