Merge "Build cache.img on demand" (c05642d7) · Commits · e / os / android_build

core/Makefile

+38 −3

Original line number	Diff line number	Diff line
		@@ -613,6 +613,8 @@ define generate-userimage-prop-dictionary
		$(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMAGES_EXT_VARIANT)" >> $(1))
		$(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1))
		$(if $(BOARD_USERDATAIMAGE_PARTITION_SIZE),$(hide) echo "userdata_size=$(BOARD_USERDATAIMAGE_PARTITION_SIZE)" >> $(1))
		$(if $(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "cache_fs_type=$(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		$(if $(BOARD_CACHEIMAGE_PARTITION_SIZE),$(hide) echo "cache_size=$(BOARD_CACHEIMAGE_PARTITION_SIZE)" >> $(1))
		$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))
		$(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1))
		endef
		@@ -925,6 +927,38 @@ userdatatarball-nodeps: $(FS_GET_STATS)
		$(build-userdatatarball-target)


		# -----------------------------------------------------------------
		# cache partition image
		ifdef BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE
		INTERNAL_CACHEIMAGE_FILES := \
		$(filter $(TARGET_OUT_CACHE)/%,$(ALL_DEFAULT_INSTALLED_MODULES))

		cacheimage_intermediates := \
		$(call intermediates-dir-for,PACKAGING,cache)
		BUILT_CACHEIMAGE_TARGET := $(PRODUCT_OUT)/cache.img

		define build-cacheimage-target
		$(call pretty,"Target cache fs image: $(INSTALLED_CACHEIMAGE_TARGET)")
		@mkdir -p $(TARGET_OUT_CACHE)
		@mkdir -p $(cacheimage_intermediates) && rm -rf $(cacheimage_intermediates)/cache_image_info.txt
		$(call generate-userimage-prop-dictionary, $(cacheimage_intermediates)/cache_image_info.txt)
		$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \
		./build/tools/releasetools/build_image.py \
		$(TARGET_OUT_CACHE) $(cacheimage_intermediates)/cache_image_info.txt $(INSTALLED_CACHEIMAGE_TARGET)
		$(hide) $(call assert-max-image-size,$(INSTALLED_CACHEIMAGE_TARGET),$(BOARD_CACHEIMAGE_PARTITION_SIZE),yaffs)
		endef

		# We just build this directly to the install location.
		INSTALLED_CACHEIMAGE_TARGET := $(BUILT_CACHEIMAGE_TARGET)
		$(INSTALLED_CACHEIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_CACHEIMAGE_FILES)
		$(build-cacheimage-target)

		.PHONY: cacheimage-nodeps
		cacheimage-nodeps: \| $(INTERNAL_USERIMAGES_DEPS)
		$(build-cacheimage-target)

		endif # BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE

		# -----------------------------------------------------------------
		# bring in the installer image generation defines if necessary
		ifeq ($(TARGET_USE_DISKINSTALLER),true)
		@@ -1006,6 +1040,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
		$(INSTALLED_RECOVERYIMAGE_TARGET) \
		$(INSTALLED_SYSTEMIMAGE) \
		$(INSTALLED_USERDATAIMAGE_TARGET) \
		$(INSTALLED_CACHEIMAGE_TARGET) \
		$(INSTALLED_ANDROID_INFO_TXT_TARGET) \
		$(built_ota_tools) \
		$(APKCERTS_FILE) \

core/envsetup.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,8 @@ TARGET_OUT_DATA_ETC := $(TARGET_OUT_ETC)
		TARGET_OUT_DATA_STATIC_LIBRARIES:= $(TARGET_OUT_STATIC_LIBRARIES)
		TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest

		TARGET_OUT_CACHE := $(PRODUCT_OUT)/cache

		TARGET_OUT_VENDOR := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)
		TARGET_OUT_VENDOR_EXECUTABLES:= $(TARGET_OUT_VENDOR)/bin
		TARGET_OUT_VENDOR_OPTIONAL_EXECUTABLES:= $(TARGET_OUT_VENDOR)/xbin

core/main.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -743,6 +743,9 @@ endif
		.PHONY: userdatatarball
		userdatatarball: $(INSTALLED_USERDATATARBALL_TARGET)

		.PHONY: cacheimage
		cacheimage: $(INSTALLED_CACHEIMAGE_TARGET)

		.PHONY: bootimage
		bootimage: $(INSTALLED_BOOTIMAGE_TARGET)

		@@ -757,6 +760,7 @@ droidcore: files \
		$(INSTALLED_BOOTIMAGE_TARGET) \
		$(INSTALLED_RECOVERYIMAGE_TARGET) \
		$(INSTALLED_USERDATAIMAGE_TARGET) \
		$(INSTALLED_CACHEIMAGE_TARGET) \
		$(INSTALLED_FILES_FILE)

		# dist_files only for putting your library into the dist directory with a full build.

core/product.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -227,6 +227,8 @@ _product_stash_var_list += \
		BOARD_RECOVERYIMAGE_PARTITION_SIZE \
		BOARD_SYSTEMIMAGE_PARTITION_SIZE \
		BOARD_USERDATAIMAGE_PARTITION_SIZE \
		BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE \
		BOARD_CACHEIMAGE_PARTITION_SIZE \
		BOARD_FLASH_BLOCK_SIZE \
		BOARD_SYSTEMIMAGE_PARTITION_SIZE \
		BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE \

tools/releasetools/build_image.py

+18 −7

Original line number	Diff line number	Diff line
		@@ -67,22 +67,28 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
		mount_point: such as "system", "data" etc.
		"""
		d = {}

		def copy_prop(src_p, dest_p):
		if src_p in glob_dict:
		d[dest_p] = str(glob_dict[src_p])

		common_props = (
		"fs_type",
		"extfs_sparse_flag",
		"mkyaffs2_extra_flags",
		)
		for p in common_props:
		if p in glob_dict:
		d[p] = glob_dict[p]
		copy_prop(p, p)

		d["mount_point"] = mount_point
		if mount_point == "system":
		if "system_size" in glob_dict:
		d["partition_size"] = str(glob_dict["system_size"])
		copy_prop("fs_type", "fs_type")
		copy_prop("system_size", "partition_size")
		elif mount_point == "data":
		if "userdata_size" in glob_dict:
		d["partition_size"] = str(glob_dict["userdata_size"])
		copy_prop("fs_type", "fs_type")
		copy_prop("userdata_size", "partition_size")
		elif mount_point == "cache":
		copy_prop("cache_fs_type", "fs_type")
		copy_prop("cache_size", "partition_size")

		return d

		@@ -117,6 +123,11 @@ def main(argv):
		mount_point = "system"
		elif image_filename == "userdata.img":
		mount_point = "data"
		elif image_filename == "cache.img":
		mount_point = "cache"
		else:
		print >> sys.stderr, "error: unknown image file name ", image_filename
		exit(1)

		image_properties = ImagePropFromGlobalDict(glob_dict, mount_point)
		if not BuildImage(in_dir, image_properties, out_file):