OSDN Git Service

Move BOARD_SYSTEMIMAGE_PARTITION_SIZE check to the correct target
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 15 Aug 2016 21:30:17 +0000 (23:30 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 15 Aug 2016 21:30:17 +0000 (23:30 +0200)
This fixes 7e49f23

core/Makefile

index a359e1a..d32c0ae 100644 (file)
@@ -1041,7 +1041,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)
@@ -1278,9 +1280,7 @@ 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.