OSDN Git Service

Do not call assert-max-image-size when system image size is calculated automatically
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 15 Aug 2016 20:15:51 +0000 (22:15 +0200)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 4 May 2017 06:31:53 +0000 (14:31 +0800)
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.

core/Makefile

index 7374b71..1075d8d 100644 (file)
@@ -1178,7 +1178,9 @@ endif
 $(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP)
        @echo "Install system fs image: $@"
        $(copy-file-to-target)
+ifneq (0,$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
        $(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
+endif
 
 ifneq ($(MKSQUASHFS),)
 $(PRODUCT_OUT)/system.sfs: $(BUILT_SYSTEMIMAGE)
@@ -1192,7 +1194,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))