build: rename bootloader.img.encrypt to bootloader.img in signed fw [1/1]

PD#SWPL-14197
bug:141100679

Problem:
out/target/product/sabrina/bootloader.img is not the same
as out/target/product/sabrina/fastboot_auto.bootloader.img

Solution:
remove unsign bootloader.img in signed PRODUCT_OUT
rename PRODUCT_OUT/bootloader.img.encrypt to PRODUCT_OUT/bootloader.img

Verify:
sabrina

Change-Id: I56087af4b961804e61f894f1d0eb1fe68e9b2b14

1 files changed, 7 insertions, 18 deletions

diff --git a/factory.mk b/factory.mk
index ee25f61..e145650 100644
--- a/factory.mk
+++ b/factory.mk
@@ -9,9 +9,7 @@ else
 BUILT_IMAGES := boot.img recovery.img dt.img
 endif
 
-ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true)
-BUILT_IMAGES += bootloader.img.encrypt
-else
+ifneq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true)
 BUILT_IMAGES += bootloader.img
 endif
 
@@ -189,8 +187,9 @@ BOARD_PACK_RADIOIMAGES += $(basename $(filter %.img.encrypt,$(BUILT_IMAGES)))
 $(warning echo "radio add $(filter %.img.encrypt,$(BUILT_IMAGES))")
 else
 ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true)
-INSTALLED_RADIOIMAGE_TARGET += $(addprefix $(PRODUCT_OUT)/,$(filter dt.img bootloader.img.encrypt,$(BUILT_IMAGES)))
-BOARD_PACK_RADIOIMAGES += $(filter dt.img bootloader.img.encrypt,$(BUILT_IMAGES))
+INSTALLED_RADIOIMAGE_TARGET += $(PRODUCT_OUT)/dt.img
+INSTALLED_RADIOIMAGE_TARGET += $(PRODUCT_OUT)/bootloader.img
+BOARD_PACK_RADIOIMAGES += dt.img bootloader.img
 else
 INSTALLED_RADIOIMAGE_TARGET += $(addprefix $(PRODUCT_OUT)/,$(filter dt.img bootloader.img,$(BUILT_IMAGES)))
 BOARD_PACK_RADIOIMAGES += $(filter dt.img bootloader.img,$(BUILT_IMAGES))
@@ -315,9 +314,6 @@ INSTALLED_AMLOGIC_BOOTLOADER_TARGET := $(PRODUCT_OUT)/bootloader.img
 ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
 	INSTALLED_AMLOGIC_BOOTLOADER_TARGET := $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET).encrypt
 endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
-ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true)
-    INSTALLED_AMLOGIC_BOOTLOADER_TARGET := $(PRODUCT_OUT)/bootloader.img.encrypt
-endif
 .PHONY: aml_bootloader
 aml_bootloader : $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET)
 
@@ -370,13 +366,12 @@ endif
 
 	bash $(ANDROID_HOME_DIR)/$(PRODUCT_GOOGLEREF_SECURE_BOOT_TOOL)
 	mkdir -p $(PRODUCT_OUT)/upgrade/
-	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.signed $(PRODUCT_OUT)/bootloader.img.encrypt
+	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.signed $(PRODUCT_OUT)/bootloader.img
 	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.signed $(PRODUCT_OUT)/upgrade/bootloader.img.encrypt
 	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.usb.bl2.signed $(PRODUCT_OUT)/upgrade/
 	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.usb.tpl.signed $(PRODUCT_OUT)/upgrade/
 	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.sd.signed $(PRODUCT_OUT)/upgrade/
 
-	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin $(PRODUCT_OUT)/bootloader.img
 	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin $(PRODUCT_OUT)/upgrade/bootloader.img
 	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.usb.bl2 $(PRODUCT_OUT)/upgrade/
 	cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.usb.tpl $(PRODUCT_OUT)/upgrade/
@@ -494,6 +489,7 @@ $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): \
 	$(INSTALLED_AML_USER_IMAGES) \
 	$(INSTALLED_AML_LOGO) \
 	$(INSTALLED_MANIFEST_XML) \
+	$(INSTALLED_AMLOGIC_BOOTLOADER_TARGET) \
 	$(TARGET_USB_BURNING_V2_DEPEND_MODULES)
 	mkdir -p $(PRODUCT_UPGRADE_OUT)
 	$(hide) $(foreach file,$(UPGRADE_FILES), \
@@ -542,11 +538,7 @@ ifneq ($(TARGET_NO_RECOVERY),true)
 	FASTBOOT_IMAGES += recovery.img
 endif
 
-ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true)
-FASTBOOT_IMAGES += bootloader.img.encrypt
-else
 FASTBOOT_IMAGES += bootloader.img
-endif
 
 ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
 	FASTBOOT_IMAGES := $(addsuffix .encrypt, $(FASTBOOT_IMAGES))
@@ -620,9 +612,6 @@ else
 	cp $(PRODUCT_OUT)/bootloader.img $(PRODUCT_OUT)/fastboot_auto/
 	cp $(PRODUCT_OUT)/dt.img $(PRODUCT_OUT)/fastboot_auto/
 endif
-ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true)
-	cp $(PRODUCT_OUT)/bootloader.img.encrypt $(PRODUCT_OUT)/fastboot_auto/bootloader.img
-endif
 	cp $(PRODUCT_OUT)/odm.img $(PRODUCT_OUT)/fastboot_auto/
 	cp $(PRODUCT_OUT)/upgrade/logo.img $(PRODUCT_OUT)/fastboot_auto/
 ifeq ($(AB_OTA_UPDATER),true)
@@ -678,7 +667,7 @@ ifneq ($(INSTALLED_AMLOGIC_BOOTLOADER_TARGET),)
 	cp $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET) $(AML_TARGET)/IMAGES/bootloader.img
 endif
 ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true)
-	cp $(PRODUCT_OUT)/bootloader.img.encrypt $(AML_TARGET)/IMAGES/bootloader.img
+	cp $(PRODUCT_OUT)/bootloader.img $(AML_TARGET)/IMAGES/bootloader.img
 endif
 ifneq ($(INSTALLED_AML_LOGO),)
 	@echo "copy $(INSTALLED_AML_LOGO)"