commit b6d89448a938c63ded10c4ee25791b810ed9a459
author Doug Zongker <dougz@android.com> Tue Jul 07 17:19:29 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jul 07 17:19:29 2009 -0700
tree 3b2a79b2f26c7d6227680df9ae9bf38af732d1dc
parent 97f696cdaab83107afb7b0d4903e8b2350cd8734
parent 8cebf1ff7836a5dc365e49f7a14d7546a651d9c7

am 8cebf1ff: fix mislaid \'if\' in recovery

Merge commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7'

* commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7':
  fix mislaid 'if' in recovery

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index d6d9d74..2595f1a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -500,6 +500,10 @@
 
 # -----------------------------------------------------------------
 # 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
@@ -734,9 +738,6 @@
 	$(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)