summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-11-26 18:10:23 -0800
committerYing Wang <wangying@google.com>2012-12-11 14:57:39 -0800
commit6a6c11215bdf3f114ed3589ede4bda006adacf7e (patch)
tree3b3d1e5fb81d9c9700105fcd035646f1a2a34f3e /core
parent5c0f9e996a819806e5f088ded011bd30ef9c46d7 (diff)
downloadbuild-6a6c11215bdf3f114ed3589ede4bda006adacf7e.zip
build-6a6c11215bdf3f114ed3589ede4bda006adacf7e.tar.gz
build-6a6c11215bdf3f114ed3589ede4bda006adacf7e.tar.bz2
Run e2fsck on built sparse images.
Bug: 7591683 Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
Diffstat (limited to 'core')
-rw-r--r--core/Makefile2
-rw-r--r--core/config.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index e0f6da8..5a60e85 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -556,7 +556,7 @@ ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED))
endif
ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)
-INTERNAL_USERIMAGES_DEPS := $(MKEXTUSERIMG) $(MAKE_EXT4FS)
+INTERNAL_USERIMAGES_DEPS := $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(SIMG2IMG) $(E2FSCK)
else
INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2)
endif
diff --git a/core/config.mk b/core/config.mk
index 747d8ed..dcb9c1f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -293,6 +293,8 @@ MKEXT2IMG := $(HOST_OUT_EXECUTABLES)/genext2fs$(HOST_EXECUTABLE_SUFFIX)
MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/make_ext4fs$(HOST_EXECUTABLE_SUFFIX)
MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh
MKEXT2BOOTIMG := external/genext2fs/mkbootimg_ext2.sh
+SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)
+E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)
MKTARBALL := build/tools/mktarball.sh
TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)
E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)