summaryrefslogtreecommitdiffstats
path: root/core/Makefile
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-10-21 23:56:59 +0300
committerMichael Bestas <mikeioannina@gmail.com>2015-10-25 07:50:49 -0700
commitc240fb90269a8d7676facd31d33116e66a141c9c (patch)
tree1e7030a9e15d3617f75227a8c3e17a536535f68b /core/Makefile
parent49834a84fca1488377c2d8cb27c90745d3934148 (diff)
downloadbuild-c240fb90269a8d7676facd31d33116e66a141c9c.zip
build-c240fb90269a8d7676facd31d33116e66a141c9c.tar.gz
build-c240fb90269a8d7676facd31d33116e66a141c9c.tar.bz2
More custom mkbootimg cleanup
* Prevent duplicate 'Made recovery image:' message when using custom mkbootimg Change-Id: I178321bcb5661e07833b1b56b5c9e2cf20e421d7
Diffstat (limited to 'core/Makefile')
-rw-r--r--core/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile
index 835edeb..c9f7588 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -583,7 +583,7 @@ bootimage-nodeps: $(MKBOOTIMG)
$(hide) $(call assert-max-image-size,$(INSTALLED_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE))
@echo -e ${CL_INS}"Made boot image: $@"${CL_RST}
- endif # PRODUCT_SUPPORTS_VERITY
+ endif # PRODUCT_SUPPORTS_VBOOT
endif # PRODUCT_SUPPORTS_BOOT_SIGNER / BOARD_CUSTOM_BOOTIMG_MK
else # TARGET_NO_KERNEL
@@ -969,8 +969,8 @@ define build-recoveryimage-target
$(BOOT_SIGNER) /recovery $(1) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1))
$(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \
$(VBOOT_SIGNER) $(FUTILITY) $(1).unsigned $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbpubk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbprivk $(1).keyblock $(1))
- $(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)))
- @echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}
+ $(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE))
+ @echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST})
endef
$(recovery_uncompressed_ramdisk): $(MINIGZIP) $(recovery_ramdisk)