Don't build userdata.img if no partition size

And retire BOARD_DONT_BUILD_USERDATA_IMG.
This unifies the logic in build/core/Makefile and
build/tools/releasetools/img_from_target_files.

Change-Id: Ib6b4e8e0d8279ed7deaf047e9dc30eb65aba013f
This commit is contained in:
Ying Wang 2013-03-15 09:03:39 -07:00
parent 7a697dd3f5
commit 4ac826b6d3
1 changed files with 2 additions and 2 deletions

View File

@ -931,7 +931,7 @@ INTERNAL_USERDATAIMAGE_FILES += \
$(filter $(TARGET_OUT_DATA)/%,$(tests_MODULES))
endif
ifneq (true,$(BOARD_DONT_BUILD_USERDATA_IMG))
ifdef BOARD_USERDATAIMAGE_PARTITION_SIZE
userdataimage_intermediates := \
$(call intermediates-dir-for,PACKAGING,userdata)
BUILT_USERDATAIMAGE_TARGET := $(PRODUCT_OUT)/userdata.img
@ -957,7 +957,7 @@ $(INSTALLED_USERDATAIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) \
userdataimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
$(build-userdataimage-target)
endif # no BOARD_DONT_BUILD_USERDATA_IMG
endif # BOARD_USERDATAIMAGE_PARTITION_SIZE is set
#######
## data partition tarball