tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Skip userdata.img only if partition size is not give for extfs.

Browse source 
We still build yaffs2 images which don't need partition size.

Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
This commit is contained in:
Ying Wang 2013-03-15 10:32:29 -07:00
parent 4ac826b6d3
commit d7321d31ac
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/Makefile
View file

@ -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

5
tools/releasetools/img_from_target_files
View file

@ -57,8 +57,9 @@ def AddUserdata(output_zip):
image_props = build_image.ImagePropFromGlobalDict(OPTIONS.info_dict,
"data")
# If no userdata_size is provided, skip userdata.img.
if not image_props.get("partition_size"):
# If no userdata_size is provided for extfs, skip userdata.img.
if (image_props.get("fs_type", "").startswith("ext") and
not image_props.get("partition_size")):
return
print "creating userdata.img..."