Merge "Use BUILD_*_IMAGE flags in add_img_to_target_files." (e08e4094) · Commits · e / os / android_build

core/Makefile

+13 −0

Original line number	Diff line number	Diff line
		@@ -1201,6 +1201,10 @@ $(if $(filter $(2),system),\
		$(if $(PRODUCT_SYSTEM_HEADROOM),$(hide) echo "system_headroom=$(PRODUCT_SYSTEM_HEADROOM)" >> $(1))
		$(if $(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "system_reserved_size=$(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))
		$(hide) echo "system_selinux_fc=$(SELINUX_FC)" >> $(1)
		$(hide) echo "building_system_image=$(BUILDING_SYSTEM_IMAGE)" >> $(1)
		)
		$(if $(filter $(2),system_other),\
		$(hide) echo "building_system_other_image=$(BUILDING_SYSTEM_OTHER_IMAGE)" >> $(1)
		)
		$(if $(filter $(2),userdata),\
		$(if $(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		@@ -1208,11 +1212,13 @@ $(if $(filter $(2),userdata),\
		$(if $(PRODUCT_FS_CASEFOLD),$(hide) echo "needs_casefold=$(PRODUCT_FS_CASEFOLD)" >> $(1))
		$(if $(PRODUCT_QUOTA_PROJID),$(hide) echo "needs_projid=$(PRODUCT_QUOTA_PROJID)" >> $(1))
		$(hide) echo "userdata_selinux_fc=$(SELINUX_FC)" >> $(1)
		$(hide) echo "building_userdata_image=$(BUILDING_USERDATA_IMAGE)" >> $(1)
		)
		$(if $(filter $(2),cache),\
		$(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))
		$(hide) echo "cache_selinux_fc=$(SELINUX_FC)" >> $(1)
		$(hide) echo "building_cache_image=$(BUILDING_CACHE_IMAGE)" >> $(1)
		)
		$(if $(filter $(2),vendor),\
		$(if $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "vendor_fs_type=$(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		@@ -1227,6 +1233,7 @@ $(if $(filter $(2),vendor),\
		$(if $(PRODUCT_VENDOR_BASE_FS_PATH),$(hide) echo "vendor_base_fs_file=$(PRODUCT_VENDOR_BASE_FS_PATH)" >> $(1))
		$(if $(BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "vendor_reserved_size=$(BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))
		$(hide) echo "vendor_selinux_fc=$(SELINUX_FC)" >> $(1)
		$(hide) echo "building_vendor_image=$(BUILDING_VENDOR_IMAGE)" >> $(1)
		)
		$(if $(filter $(2),product),\
		$(if $(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "product_fs_type=$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		@@ -1241,6 +1248,7 @@ $(if $(filter $(2),product),\
		$(if $(PRODUCT_PRODUCT_BASE_FS_PATH),$(hide) echo "product_base_fs_file=$(PRODUCT_PRODUCT_BASE_FS_PATH)" >> $(1))
		$(if $(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "product_reserved_size=$(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))
		$(hide) echo "product_selinux_fc=$(SELINUX_FC)" >> $(1)
		$(hide) echo "building_product_image=$(BUILDING_PRODUCT_IMAGE)" >> $(1)
		)
		$(if $(filter $(2),system_ext),\
		$(if $(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_ext_fs_type=$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		@@ -1254,6 +1262,7 @@ $(if $(filter $(2),system_ext),\
		$(if $(BOARD_SYSTEM_EXTIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "system_ext_squashfs_disable_4k_align=$(BOARD_SYSTEM_EXTIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1))
		$(if $(BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "system_ext_reserved_size=$(BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))
		$(hide) echo "system_ext_selinux_fc=$(SELINUX_FC)" >> $(1)
		$(hide) echo "building_system_ext_image=$(BUILDING_SYSTEM_EXT_IMAGE)" >> $(1)
		)
		$(if $(filter $(2),odm),\
		$(if $(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "odm_fs_type=$(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
		@@ -1268,6 +1277,7 @@ $(if $(filter $(2),odm),\
		$(if $(PRODUCT_ODM_BASE_FS_PATH),$(hide) echo "odm_base_fs_file=$(PRODUCT_ODM_BASE_FS_PATH)" >> $(1))
		$(if $(BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "odm_reserved_size=$(BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))
		$(hide) echo "odm_selinux_fc=$(SELINUX_FC)" >> $(1)
		$(hide) echo "building_odm_image=$(BUILDING_ODM_IMAGE)" >> $(1)
		)
		$(if $(filter $(2),oem),\
		$(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))
		@@ -1362,6 +1372,9 @@ endif
		ifdef BUILDING_SYSTEM_IMAGE
		PROP_DICTIONARY_IMAGES += system
		endif
		ifdef BUILDING_SYSTEM_OTHER_IMAGE
		PROP_DICTIONARY_IMAGES += system_other
		endif
		ifdef BUILDING_USERDATA_IMAGE
		PROP_DICTIONARY_IMAGES += userdata
		endif

tools/releasetools/add_img_to_target_files.py

+26 −17

Original line number	Diff line number	Diff line
		@@ -741,23 +741,32 @@ def AddImagesToTargetFiles(filename):
		# target_files.zip as a prebuilt blob. We consider either of them as
		# {vendor,product,system_ext}.img being available, which could be
		# used when generating vbmeta.img for AVB.
		has_vendor = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "VENDOR")) or
		os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
		"vendor.img")))
		has_odm = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "ODM")) or
		os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
		"odm.img")))
		has_product = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "PRODUCT")) or
		os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
		"product.img")))
		has_system_ext = (os.path.isdir(os.path.join(OPTIONS.input_tmp,
		"SYSTEM_EXT")) or
		os.path.exists(os.path.join(OPTIONS.input_tmp,
		"IMAGES",
		"system_ext.img")))
		has_system = os.path.isdir(os.path.join(OPTIONS.input_tmp, "SYSTEM"))
		has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp,
		"SYSTEM_OTHER"))
		has_vendor = ((os.path.isdir(os.path.join(OPTIONS.input_tmp, "VENDOR")) and
		OPTIONS.info_dict.get("building_vendor_image") == "true") or
		os.path.exists(
		os.path.join(OPTIONS.input_tmp, "IMAGES", "vendor.img")))
		has_odm = ((os.path.isdir(os.path.join(OPTIONS.input_tmp, "ODM")) and
		OPTIONS.info_dict.get("building_odm_image") == "true") or
		os.path.exists(
		os.path.join(OPTIONS.input_tmp, "IMAGES", "odm.img")))
		has_product = ((os.path.isdir(os.path.join(OPTIONS.input_tmp, "PRODUCT")) and
		OPTIONS.info_dict.get("building_product_image") == "true") or
		os.path.exists(
		os.path.join(OPTIONS.input_tmp, "IMAGES", "product.img")))
		has_system_ext = (
		(os.path.isdir(os.path.join(OPTIONS.input_tmp, "SYSTEM_EXT")) and
		OPTIONS.info_dict.get("building_system_ext_image") == "true") or
		os.path.exists(
		os.path.join(OPTIONS.input_tmp, "IMAGES", "system_ext.img")))
		has_system = (
		os.path.isdir(os.path.join(OPTIONS.input_tmp, "SYSTEM")) and
		OPTIONS.info_dict.get("building_system_image") == "true")

		has_system_other = (
		os.path.isdir(os.path.join(OPTIONS.input_tmp, "SYSTEM_OTHER")) and
		OPTIONS.info_dict.get("building_system_other_image") == "true")
		has_userdata = OPTIONS.info_dict.get("building_userdata_image") == "true"
		has_cache = OPTIONS.info_dict.get("building_cache_image") == "true"

		# Set up the output destination. It writes to the given directory for dir
		# mode; otherwise appends to the given ZIP.

tools/releasetools/merge_target_files.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,9 @@ DEFAULT_FRAMEWORK_MISC_INFO_KEYS = (
		'ab_update',
		'default_system_dev_certificate',
		'system_size',
		'building_system_image',
		'building_system_ext_image',
		'building_product_image',
		)

		# DEFAULT_VENDOR_ITEM_LIST is a list of items to extract from the partial