commit 69e9b4d6d1e9647c3f9c011bad0f22138911a413
author Ying Wang <wangying@google.com> Mon Nov 26 18:10:23 2012 -0800
committer Ying Wang <wangying@google.com> Tue Nov 27 09:57:17 2012 -0800
tree 167114c44d3ad77a20e87d2d7e4b675769ed32a0
parent 4c057c9ab47b406a209266f520d6757f0af3b3aa

Run e2fsck on built sparse images.

Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 024e203..e34ad49 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -564,7 +564,7 @@
 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

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 61f72d2..16bcd69 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -298,6 +298,8 @@
 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)