From 1e96ac8430da922332e4c85e7eed0e95442ff2ce Mon Sep 17 00:00:00 2001 From: Sriram Raman Date: Fri, 24 Jul 2009 13:52:32 -0700 Subject: [PATCH] Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed. Don't have to re-specify exclusion list for the patch file construction. --- core/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 27e3eac96..9247c7578 100644 --- a/core/Makefile +++ b/core/Makefile @@ -646,8 +646,7 @@ endif # as the source (since they are very similar). Generate the patch so # we can see how big it's going to be, and include that in the system # image size check calculation. -ifneq ($(TARGET_PRODUCT),sdk) -ifneq ($(TARGET_PRODUCT),generic) +ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),) intermediates := $(call intermediates-dir-for,PACKAGING,recovery_patch) RECOVERY_FROM_BOOT_PATCH := $(intermediates)/recovery_from_boot.p $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \ @@ -657,8 +656,8 @@ $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \ @echo "Construct recovery from boot" mkdir -p $(dir $@) PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@ -endif # TARGET_PRODUCT != generic -endif # TARGET_PRODUCT != sdk +endif + $(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP) @echo "Install system fs image: $@" -- 2.11.0