From: Doug Zongker <dougz@android.com>
Date: Fri, 24 Jul 2009 00:52:36 +0000 (-0700)
Subject: fix system size calculation for SDK build
X-Git-Tag: android-x86-1.6~20^2~21
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7a7cd0d8a3ee6d061d7b505583cb791eec6124f5;p=android-x86%2Fbuild.git

fix system size calculation for SDK build

The SDK build doesn't have recovery, don't try to generate a patch or
include it in the system image size calculation.  Also there's a
dependency on bsdiff that was omitted.
---

diff --git a/core/Makefile b/core/Makefile
index c723898ea..656a663f8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -646,14 +646,19 @@ 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)
 intermediates := $(call intermediates-dir-for,PACKAGING,recovery_patch)
 RECOVERY_FROM_BOOT_PATCH := $(intermediates)/recovery_from_boot.p
 $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \
                              $(INSTALLED_BOOTIMAGE_TARGET) \
-			     | $(HOST_OUT_EXECUTABLES)/imgdiff
+			     | $(HOST_OUT_EXECUTABLES)/imgdiff \
+	                       $(HOST_OUT_EXECUTABLES)/bsdiff
 	@echo "Construct recovery from boot"
 	mkdir -p $(dir $@)
 	$(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@
+else  # TARGET_PRODUCT == sdk
+RECOVERY_FROM_BOOT_PATCH :=
+endif
 
 $(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP)
 	@echo "Install system fs image: $@"