From: Jaap Jan Meijer <jjmeijer88@gmail.com>
Date: Mon, 15 Aug 2016 20:15:51 +0000 (+0200)
Subject: Do not call assert-max-image-size when system image size is calculated automatically
X-Git-Tag: android-x86-6.0-r1~4
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fbuild.git;a=commitdiff_plain;h=7e49f2315468f06f2209f1dbeb521916b5494e7e

Do not call assert-max-image-size when system image size is calculated automatically

When BOARD_SYSTEMIMAGE_PARTITION_SIZE is set to 0 the system image size is calculated
automatically, it does not make sense to call assert-max-image-size and it will fail.
---

diff --git a/core/Makefile b/core/Makefile
index 5e15397b8..a359e1a60 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1055,7 +1055,9 @@ systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \
 	            | $(INTERNAL_USERIMAGES_DEPS)
 	@echo "make $@: ignoring dependencies"
 	$(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE))
+ifneq (0,$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
 	$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
+endif
 
 ifneq (,$(filter systemimage-nodeps snod, $(MAKECMDGOALS)))
 ifeq (true,$(WITH_DEXPREOPT))
@@ -1276,7 +1278,9 @@ define build-vendorimage-target
   $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \
       ./build/tools/releasetools/build_image.py \
       $(TARGET_OUT_VENDOR) $(vendorimage_intermediates)/vendor_image_info.txt $(INSTALLED_VENDORIMAGE_TARGET) $(TARGET_OUT)
+ifneq (0,$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
   $(hide) $(call assert-max-image-size,$(INSTALLED_VENDORIMAGE_TARGET),$(BOARD_VENDORIMAGE_PARTITION_SIZE))
+endif
 endef
 
 # We just build this directly to the install location.