commit 9d4dbe09edcaeccd461138b5aefceb76759f5fd9
author Tao Bao <tbao@google.com> Tue Dec 22 22:22:44 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 22 22:22:44 2015 +0000
tree fdd462c0db691f914beb7d5d3a08e6c3c9bffcc5
parent d52953e9ed3a9625a61548234575acd4f0bbe87a
parent 4594d0e0fdfabe9c8a3081caf1c7c7c213c25d23

Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 19b70a8..365ea2e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -982,7 +982,7 @@
 		$(RECOVERY_INSTALL_OTA_KEYS)
 		$(call build-recoveryimage-target, $@)
 
-ifeq (,$(filter true, $(BOARD_USES_FULL_RECOVERY_IMAGE) $(BOARD_USES_RECOVERY_AS_BOOT)))
+ifdef RECOVERY_RESOURCE_ZIP
 $(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET) | $(ZIPTIME)
 	$(hide) mkdir -p $(dir $@)
 	$(hide) find $(TARGET_RECOVERY_ROOT_OUT)/res -type f | sort | zip -0qrjX $@ -@