diff options
| author | Ying Wang <wangying@google.com> | 2013-03-15 10:32:29 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-03-15 10:32:29 -0700 |
| commit | d7321d31accd344f4f2ad0a8e0b4f47be4d5128e (patch) | |
| tree | afea44b5c2c8b6d66c29debcf2bf28cc949d85d3 /core | |
| parent | 4ac826b6d39145ac287821e6771bb2ce1102832c (diff) | |
| download | build-d7321d31accd344f4f2ad0a8e0b4f47be4d5128e.zip build-d7321d31accd344f4f2ad0a8e0b4f47be4d5128e.tar.gz build-d7321d31accd344f4f2ad0a8e0b4f47be4d5128e.tar.bz2 | |
Skip userdata.img only if partition size is not give for extfs.
We still build yaffs2 images which don't need partition size.
Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 38f5aa8..47cb114 100644 --- a/core/Makefile +++ b/core/Makefile @@ -931,7 +931,15 @@ INTERNAL_USERDATAIMAGE_FILES += \ $(filter $(TARGET_OUT_DATA)/%,$(tests_MODULES)) endif -ifdef BOARD_USERDATAIMAGE_PARTITION_SIZE +# Don't build userdata.img if it's extfs but no partition size +skip_userdata.img := +ifdef INTERNAL_USERIMAGES_EXT_VARIANT +ifndef BOARD_USERDATAIMAGE_PARTITION_SIZE +skip_userdata.img := true +endif +endif + +ifneq ($(skip_userdata.img),true) userdataimage_intermediates := \ $(call intermediates-dir-for,PACKAGING,userdata) BUILT_USERDATAIMAGE_TARGET := $(PRODUCT_OUT)/userdata.img @@ -957,7 +965,8 @@ $(INSTALLED_USERDATAIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) \ userdataimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS) $(build-userdataimage-target) -endif # BOARD_USERDATAIMAGE_PARTITION_SIZE is set +endif # not skip_userdata.img +skip_userdata.img := ####### ## data partition tarball |