From 8cebf1ff7836a5dc365e49f7a14d7546a651d9c7 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 7 Jul 2009 17:14:25 -0700 Subject: [PATCH] fix mislaid 'if' in recovery When I moved the building of the recovery image upwards in the file, I moved an 'endif' surrounding it but not the matching 'if'. How did this ever work? --- core/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index ea556311c..107d0c135 100644 --- a/core/Makefile +++ b/core/Makefile @@ -499,6 +499,10 @@ endif # ----------------------------------------------------------------- # Recovery image + +# If neither TARGET_NO_KERNEL nor TARGET_NO_RECOVERY are true +ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) + INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img recovery_initrc := $(call include-path-for, recovery)/etc/init.rc @@ -733,9 +737,6 @@ userdatatarball-nodeps: $(FS_GET_STATS) $(build-userdatatarball-target) -# If neither TARGET_NO_KERNEL nor TARGET_NO_RECOVERY are true -ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) - # ----------------------------------------------------------------- # bring in the installer image generation defines if necessary ifeq ($(TARGET_USE_DISKINSTALLER),true)