| -rw-r--r-- | factory.mk | 34 | ||||
| -rwxr-xr-x | flash-all.bat | 29 | ||||
| -rwxr-xr-x | flash-all.sh | 25 |
3 files changed, 81 insertions, 7 deletions
@@ -276,15 +276,18 @@ else INSTALLED_AML_UPGRADE_PACKAGE_TARGET := endif -INSTALLED_AML_FASTBOOT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-fastboot-$(BUILD_NUMBER).zip +INSTALLED_AML_FASTBOOT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-fastboot-image-$(BUILD_NUMBER).zip -FASTBOOT_IMAGES := android-info.txt system.img -ifeq ($(TARGET_NO_RECOVERY),true) -FASTBOOT_IMAGES += boot.img -else -FASTBOOT_IMAGES += boot.img recovery.img +FASTBOOT_IMAGES := boot.img +ifneq ($(TARGET_NO_RECOVERY),true) + FASTBOOT_IMAGES += recovery.img endif +ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) + FASTBOOT_IMAGES := $(addsuffix .encrypt, $(FASTBOOT_IMAGES)) +endif#ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) + +FASTBOOT_IMAGES += android-info.txt system.img ifneq ($(BOARD_OLD_PARTITION),true) FASTBOOT_IMAGES += vendor.img @@ -311,7 +314,24 @@ endif ifeq ($(TARGET_PRODUCT),darwin) echo "board=txlx_skt" > $(PRODUCT_OUT)/fastboot/android-info.txt endif - cd $(PRODUCT_OUT)/fastboot; zip -r ../$(TARGET_PRODUCT)-fastboot-$(BUILD_NUMBER).zip $(FASTBOOT_IMAGES) + cd $(PRODUCT_OUT)/fastboot; zip -r ../$(TARGET_PRODUCT)-fastboot-image-$(BUILD_NUMBER).zip $(FASTBOOT_IMAGES) + zipnote $@ | sed 's/@ \([a-z]*.img\).encrypt/&\n@=\1\n/' | zipnote -w $@ + mkdir -p $(PRODUCT_OUT)/fastboot_auto + cp $(PRODUCT_OUT)/$(TARGET_PRODUCT)-fastboot-image-$(BUILD_NUMBER).zip $(PRODUCT_OUT)/fastboot_auto/ +ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) + cp $(PRODUCT_OUT)/u-boot.bin.encrypt $(PRODUCT_OUT)/fastboot_auto/ + cp $(PRODUCT_OUT)/dtb.img.encrypt $(PRODUCT_OUT)/fastboot_auto/ +else + cp $(PRODUCT_OUT)/u-boot.bin $(PRODUCT_OUT)/fastboot_auto/ + cp $(PRODUCT_OUT)/dtb.img $(PRODUCT_OUT)/fastboot_auto/ +endif + cp $(PRODUCT_OUT)/odm.img $(PRODUCT_OUT)/fastboot_auto/ + cp $(PRODUCT_OUT)/upgrade/logo.img $(PRODUCT_OUT)/fastboot_auto/ + cp device/amlogic/common/flash-all.sh $(PRODUCT_OUT)/fastboot_auto/ + cp device/amlogic/common/flash-all.bat $(PRODUCT_OUT)/fastboot_auto/ + sed -i 's/fastboot -w update fastboot.zip/fastboot -w update $(TARGET_PRODUCT)-fastboot-image-$(BUILD_NUMBER).zip/' $(PRODUCT_OUT)/fastboot_auto/flash-all.sh + sed -i 's/fastboot -w update fastboot.zip/fastboot -w update $(TARGET_PRODUCT)-fastboot-image-$(BUILD_NUMBER).zip/' $(PRODUCT_OUT)/fastboot_auto/flash-all.bat + cd $(PRODUCT_OUT)/fastboot_auto; zip -r ../$(TARGET_PRODUCT)-fastboot-$(BUILD_NUMBER).zip * droidcore: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) otapackage: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) |