Merge "Remove unnecessary branch for BOARD_HAS_EXT4_RESERVED_BLOCKS."

am: f346fd4485

Change-Id: I24a729ae27b80f78383e8663b0d393591c383e17
This commit is contained in:
Yifan Hong 2018-05-29 13:13:34 -07:00 committed by android-build-merger
commit 63df69d1d5
1 changed files with 1 additions and 6 deletions

View File

@ -1578,12 +1578,7 @@ define build-systemimage-target
$(TARGET_OUT) $(systemimage_intermediates)/system_image_info.txt $(1) $(TARGET_OUT) \
|| ( echo "Out of space? the tree size of $(TARGET_OUT) is (MB): " 1>&2 ;\
du -sm $(TARGET_OUT) 1>&2;\
if [ "$(INTERNAL_USERIMAGES_EXT_VARIANT)" == "ext4" ]; then \
maxsize=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE); \
echo "The max is $$(( maxsize / 1048576 )) MB." 1>&2 ;\
else \
echo "The max is $$(( $(BOARD_SYSTEMIMAGE_PARTITION_SIZE) / 1048576 )) MB." 1>&2 ;\
fi; \
echo "The max is $$(( $(BOARD_SYSTEMIMAGE_PARTITION_SIZE) / 1048576 )) MB." 1>&2 ;\
mkdir -p $(DIST_DIR); cp $(INSTALLED_FILES_FILE) $(DIST_DIR)/installed-files-rescued.txt; \
exit 1 )
endef