diff options
| author | Ying Wang <wangying@google.com> | 2012-12-18 15:28:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-18 15:28:50 -0800 |
| commit | 5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c (patch) | |
| tree | f73e9bce6aa6e4fd674ffd976ae572a8cb06899a /core | |
| parent | 16cb8655bd96cf32d192acd787d27504153a96ae (diff) | |
| parent | 6a6c11215bdf3f114ed3589ede4bda006adacf7e (diff) | |
| download | build-5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c.zip build-5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c.tar.gz build-5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c.tar.bz2 | |
am 6a6c1121: Run e2fsck on built sparse images.
* commit '6a6c11215bdf3f114ed3589ede4bda006adacf7e':
Run e2fsck on built sparse images.
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/config.mk | 2 |
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) |