Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca770ac9 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge branch 'pie-gsi' of https://android.googlesource.com/platform/build into HEAD 

Change-Id: Ia39ed2e90b9fe520391b139b9b63212f4a96cc7d
parents 0f064e43 b8df718f

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -488,6 +488,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher3) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher3_intermediates)



$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "vr_hwc*" -print0 | xargs -0 rm -f)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+226 −79
Original line number Diff line number Diff line
@@ -423,7 +423,13 @@ $(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) $(intermediate_sys 
	$(hide) echo ro.vendor.product.cpu.abilist="$(TARGET_CPU_ABI_LIST)">>$@

	$(hide) echo ro.vendor.product.cpu.abilist32="$(TARGET_CPU_ABI_LIST_32_BIT)">>$@

	$(hide) echo ro.vendor.product.cpu.abilist64="$(TARGET_CPU_ABI_LIST_64_BIT)">>$@

	$(hide) TARGET_DEVICE="$(TARGET_DEVICE)" \

	$(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \

			BUILD_ID="$(BUILD_ID)" \

			BUILD_NUMBER="$(BUILD_NUMBER_FROM_FILE)" \

			PLATFORM_VERSION="$(PLATFORM_VERSION)" \

			PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \

			BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

			TARGET_DEVICE="$(TARGET_DEVICE)" \

			PRODUCT_NAME="$(TARGET_PRODUCT)" \

			PRODUCT_BRAND="$(PRODUCT_BRAND)" \

			PRODUCT_MODEL="$(PRODUCT_MODEL)" \
@@ -446,7 +452,7 @@ INSTALLED_PRODUCT_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT)/build.prop 
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_BUILD_PROP_TARGET)



FINAL_PRODUCT_PROPERTIES += \

    $(call collapse-pairs, $(PRODUCT_PRODUCT_PROPERTIES))

    $(call collapse-pairs, $(PRODUCT_PRODUCT_PROPERTIES) $(ADDITIONAL_PRODUCT_PROPERTIES))

FINAL_PRODUCT_PROPERTIES := $(call uniq-pairs-by-first-component, \

    $(FINAL_PRODUCT_PROPERTIES),=)
@@ -1109,29 +1115,49 @@ ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true) 
INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF)

endif



ifeq (true,$(USE_LOGICAL_PARTITIONS))



ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)

  $(error vboot 1.0 doesn't support logical partition)

endif



# TODO(b/80195851): Should not define BOARD_AVB_SYSTEM_KEY_PATH without

# BOARD_AVB_SYSTEM_DETACHED_VBMETA.



endif # USE_LOGICAL_PARTITIONS



# $(1): the path of the output dictionary file

# $(2): additional "key=value" pairs to append to the dictionary file.

define generate-userimage-prop-dictionary

# $(2): a subset of "system vendor cache userdata product oem"

# $(3): additional "key=value" pairs to append to the dictionary file.

define generate-image-prop-dictionary

$(hide) echo "ext_mkuserimg=$(notdir $(MKEXTUSERIMG))" >> $(1)

$(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMAGES_EXT_VARIANT)" >> $(1))

$(if $(filter $(2),system),\

    $(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT),$(hide) echo "system_extfs_inode_count=$(BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_EXTFS_RSV_PCT),$(hide) echo "system_extfs_rsv_pct=$(BOARD_SYSTEMIMAGE_EXTFS_RSV_PCT)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1))

$(if $(BOARD_EXT4_SHARE_DUP_BLOCKS),$(hide) echo "ext4_share_dup_blocks=$(BOARD_EXT4_SHARE_DUP_BLOCKS)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "system_squashfs_compressor=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "system_squashfs_compressor_opt=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_BLOCK_SIZE),$(hide) echo "system_squashfs_block_size=$(BOARD_SYSTEMIMAGE_SQUASHFS_BLOCK_SIZE)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "system_squashfs_disable_4k_align=$(BOARD_SYSTEMIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1))

    $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH),$(hide) echo "system_base_fs_file=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH)" >> $(1))

    $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_HEADROOM),$(hide) echo "system_headroom=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_HEADROOM)" >> $(1))

    $(if $(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "system_reserved_size=$(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))

)

$(if $(BOARD_EXT4_SHARE_DUP_BLOCKS),$(hide) echo "ext4_share_dup_blocks=$(BOARD_EXT4_SHARE_DUP_BLOCKS)" >> $(1))

$(if $(filter $(2),userdata),\

    $(if $(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

    $(if $(BOARD_USERDATAIMAGE_PARTITION_SIZE),$(hide) echo "userdata_size=$(BOARD_USERDATAIMAGE_PARTITION_SIZE)" >> $(1))

)

$(if $(BOARD_FLASH_LOGICAL_BLOCK_SIZE), $(hide) echo "flash_logical_block_size=$(BOARD_FLASH_LOGICAL_BLOCK_SIZE)" >> $(1))

$(if $(BOARD_FLASH_ERASE_BLOCK_SIZE), $(hide) echo "flash_erase_block_size=$(BOARD_FLASH_ERASE_BLOCK_SIZE)" >> $(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))

)

$(if $(filter $(2),vendor),\

    $(if $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "vendor_fs_type=$(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

    $(if $(BOARD_VENDORIMAGE_EXTFS_INODE_COUNT),$(hide) echo "vendor_extfs_inode_count=$(BOARD_VENDORIMAGE_EXTFS_INODE_COUNT)" >> $(1))

    $(if $(BOARD_VENDORIMAGE_EXTFS_RSV_PCT),$(hide) echo "vendor_extfs_rsv_pct=$(BOARD_VENDORIMAGE_EXTFS_RSV_PCT)" >> $(1))
@@ -1142,6 +1168,9 @@ $(if $(BOARD_VENDORIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "vendor_squashfs_ 
    $(if $(BOARD_VENDORIMAGE_SQUASHFS_BLOCK_SIZE),$(hide) echo "vendor_squashfs_block_size=$(BOARD_VENDORIMAGE_SQUASHFS_BLOCK_SIZE)" >> $(1))

    $(if $(BOARD_VENDORIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "vendor_squashfs_disable_4k_align=$(BOARD_VENDORIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1))

    $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH),$(hide) echo "vendor_base_fs_file=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH)" >> $(1))

    $(if $(BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "vendor_reserved_size=$(BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))

)

$(if $(filter $(2),product),\

    $(if $(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "product_fs_type=$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

    $(if $(BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT),$(hide) echo "product_extfs_inode_count=$(BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT)" >> $(1))

    $(if $(BOARD_PRODUCTIMAGE_EXTFS_RSV_PCT),$(hide) echo "product_extfs_rsv_pct=$(BOARD_PRODUCTIMAGE_EXTFS_RSV_PCT)" >> $(1))
@@ -1152,10 +1181,14 @@ $(if $(BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "product_squashf 
    $(if $(BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE),$(hide) echo "product_squashfs_block_size=$(BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE)" >> $(1))

    $(if $(BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "product_squashfs_disable_4k_align=$(BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1))

    $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH),$(hide) echo "product_base_fs_file=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH)" >> $(1))

    $(if $(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "product_reserved_size=$(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))

)

$(if $(filter $(2),oem),\

    $(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))

    $(if $(BOARD_OEMIMAGE_JOURNAL_SIZE),$(hide) echo "oem_journal_size=$(BOARD_OEMIMAGE_JOURNAL_SIZE)" >> $(1))

    $(if $(BOARD_OEMIMAGE_EXTFS_INODE_COUNT),$(hide) echo "oem_extfs_inode_count=$(BOARD_OEMIMAGE_EXTFS_INODE_COUNT)" >> $(1))

    $(if $(BOARD_OEMIMAGE_EXTFS_RSV_PCT),$(hide) echo "oem_extfs_rsv_pct=$(BOARD_OEMIMAGE_EXTFS_RSV_PCT)" >> $(1))

)

$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG),$(hide) echo "squashfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG)" >> $(1))

$(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(1)
@@ -1198,9 +1231,22 @@ $(if $(BOARD_AVB_ENABLE),\ 
$(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\

    $(hide) echo "recovery_as_boot=true" >> $(1))

$(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),\

    $(hide) echo "system_root_image=true" >> $(1);\

    echo "ramdisk_dir=$(TARGET_ROOT_OUT)" >> $(1))

$(if $(2),$(hide) $(foreach kv,$(2),echo "$(kv)" >> $(1);))

    $(hide) echo "system_root_image=true" >> $(1)

    $(hide) echo "root_dir=$(TARGET_ROOT_OUT)" >> $(1))

$(if $(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),$(hide) echo "use_dynamic_partition_size=true" >> $(1))

$(if $(3),$(hide) $(foreach kv,$(3),echo "$(kv)" >> $(1);))

endef



# $(1): the path of the output dictionary file

# $(2): additional "key=value" pairs to append to the dictionary file.

define generate-userimage-prop-dictionary

$(call generate-image-prop-dictionary,$(1),system vendor cache userdata product oem,$(2))

endef



# $(1): the path of the input dictionary file, where each line has the format key=value

# $(2): the key to look up

define read-image-prop-dictionary

$$(grep '$(2)=' $(1) | cut -f2- -d'=')

endef



# $(1): modules list
@@ -1633,20 +1679,13 @@ define build-systemimage-target 
  $(call create-system-vendor-symlink)

  $(call create-system-product-symlink)

  @mkdir -p $(dir $(1)) $(systemimage_intermediates) && rm -rf $(systemimage_intermediates)/system_image_info.txt

  $(call generate-userimage-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt, \

  $(call generate-image-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt,system, \

      skip_fsck=true)

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

      build/make/tools/releasetools/build_image.py \

      $(TARGET_OUT) $(systemimage_intermediates)/system_image_info.txt $(1) $(TARGET_OUT) \

      || ( echo "Out of space? the tree size of $(TARGET_OUT) is (MB): " 1>&2 ;\

           du -sm $(TARGET_OUT) 1>&2;\

           if [ "$(INTERNAL_USERIMAGES_EXT_VARIANT)" == "ext4" ]; then \

               maxsize=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE); \

               echo "The max is $$(( maxsize / 1048576 )) MB." 1>&2 ;\

           else \

               echo "The max is $$(( $(BOARD_SYSTEMIMAGE_PARTITION_SIZE) / 1048576 )) MB." 1>&2 ;\

           fi; \

           mkdir -p $(DIST_DIR); cp $(INSTALLED_FILES_FILE) $(DIST_DIR)/installed-files-rescued.txt; \

      $(systemimage_intermediates)/generated_system_image_info.txt \

      || ( mkdir -p $(DIST_DIR); cp $(INSTALLED_FILES_FILE) $(DIST_DIR)/installed-files-rescued.txt; \

           exit 1 )

endef
@@ -1690,7 +1729,9 @@ endif 
$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH)

	@echo "Install system fs image: $@"

	$(copy-file-to-target)

	$(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))

	$(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),\

		$(call read-image-prop-dictionary,\

			$(systemimage_intermediates)/generated_system_image_info.txt,system_size))



systemimage: $(INSTALLED_SYSTEMIMAGE)
@@ -1699,7 +1740,9 @@ systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \ 
	            | $(INTERNAL_USERIMAGES_DEPS)

	@echo "make $@: ignoring dependencies"

	$(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE))

	$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))

	$(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE),\

		$(call read-image-prop-dictionary,\

			$(systemimage_intermediates)/generated_system_image_info.txt,system_size))



ifneq (,$(filter systemimage-nodeps snod, $(MAKECMDGOALS)))

ifeq (true,$(WITH_DEXPREOPT))
@@ -1872,7 +1915,7 @@ define build-userdataimage-target 
  $(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)")

  @mkdir -p $(TARGET_OUT_DATA)

  @mkdir -p $(userdataimage_intermediates) && rm -rf $(userdataimage_intermediates)/userdata_image_info.txt

  $(call generate-userimage-prop-dictionary, $(userdataimage_intermediates)/userdata_image_info.txt, skip_fsck=true)

  $(call generate-image-prop-dictionary, $(userdataimage_intermediates)/userdata_image_info.txt,userdata,skip_fsck=true)

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

      build/make/tools/releasetools/build_image.py \

      $(TARGET_OUT_DATA) $(userdataimage_intermediates)/userdata_image_info.txt $(INSTALLED_USERDATAIMAGE_TARGET) $(TARGET_OUT)
@@ -1979,7 +2022,7 @@ 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, skip_fsck=true)

  $(call generate-image-prop-dictionary, $(cacheimage_intermediates)/cache_image_info.txt,cache,skip_fsck=true)

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

      build/make/tools/releasetools/build_image.py \

      $(TARGET_OUT_CACHE) $(cacheimage_intermediates)/cache_image_info.txt $(INSTALLED_CACHEIMAGE_TARGET) $(TARGET_OUT)
@@ -2036,11 +2079,14 @@ define build-systemotherimage-target 
  $(call pretty,"Target system_other fs image: $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)")

  @mkdir -p $(TARGET_OUT_SYSTEM_OTHER)

  @mkdir -p $(systemotherimage_intermediates) && rm -rf $(systemotherimage_intermediates)/system_other_image_info.txt

  $(call generate-userimage-prop-dictionary, $(systemotherimage_intermediates)/system_other_image_info.txt, skip_fsck=true)

  $(call generate-image-prop-dictionary, $(systemotherimage_intermediates)/system_other_image_info.txt,system,skip_fsck=true)

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

      build/make/tools/releasetools/build_image.py \

      $(TARGET_OUT_SYSTEM_OTHER) $(systemotherimage_intermediates)/system_other_image_info.txt $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) $(TARGET_OUT)

  $(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))

      $(TARGET_OUT_SYSTEM_OTHER) $(systemotherimage_intermediates)/system_other_image_info.txt $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) $(TARGET_OUT)\

      $(systemotherimage_intermediates)/generated_system_other_image_info.txt

  $(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),\

    $(call read-image-prop-dictionary,\

      $(systemotherimage_intermediates)/generated_system_other_image_info.txt,system_size))

endef



# We just build this directly to the install location.
@@ -2085,13 +2131,16 @@ define build-vendorimage-target 
  $(call pretty,"Target vendor fs image: $(INSTALLED_VENDORIMAGE_TARGET)")

  @mkdir -p $(TARGET_OUT_VENDOR)

  @mkdir -p $(vendorimage_intermediates) && rm -rf $(vendorimage_intermediates)/vendor_image_info.txt

  $(call generate-userimage-prop-dictionary, $(vendorimage_intermediates)/vendor_image_info.txt, skip_fsck=true)

  $(call generate-image-prop-dictionary, $(vendorimage_intermediates)/vendor_image_info.txt,vendor,skip_fsck=true)

  $(if $(BOARD_VENDOR_KERNEL_MODULES), \

    $(call build-image-kernel-modules,$(BOARD_VENDOR_KERNEL_MODULES),$(TARGET_OUT_VENDOR),vendor/,$(call intermediates-dir-for,PACKAGING,depmod_vendor)))

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

      build/make/tools/releasetools/build_image.py \

      $(TARGET_OUT_VENDOR) $(vendorimage_intermediates)/vendor_image_info.txt $(INSTALLED_VENDORIMAGE_TARGET) $(TARGET_OUT)

  $(hide) $(call assert-max-image-size,$(INSTALLED_VENDORIMAGE_TARGET),$(BOARD_VENDORIMAGE_PARTITION_SIZE))

      $(TARGET_OUT_VENDOR) $(vendorimage_intermediates)/vendor_image_info.txt $(INSTALLED_VENDORIMAGE_TARGET) $(TARGET_OUT) \

      $(vendorimage_intermediates)/generated_vendor_image_info.txt

  $(hide) $(call assert-max-image-size,$(INSTALLED_VENDORIMAGE_TARGET),\

      $(call read-image-prop-dictionary,\

          $(vendorimage_intermediates)/generated_vendor_image_info.txt,vendor_size))

endef



# We just build this directly to the install location.
@@ -2137,11 +2186,14 @@ define build-productimage-target 
  $(call pretty,"Target product fs image: $(INSTALLED_PRODUCTIMAGE_TARGET)")

  @mkdir -p $(TARGET_OUT_PRODUCT)

  @mkdir -p $(productimage_intermediates) && rm -rf $(productimage_intermediates)/product_image_info.txt

  $(call generate-userimage-prop-dictionary, $(productimage_intermediates)/product_image_info.txt, skip_fsck=true)

  $(call generate-image-prop-dictionary, $(productimage_intermediates)/product_image_info.txt,product,skip_fsck=true)

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

      ./build/tools/releasetools/build_image.py \

      $(TARGET_OUT_PRODUCT) $(productimage_intermediates)/product_image_info.txt $(INSTALLED_PRODUCTIMAGE_TARGET) $(TARGET_OUT)

  $(hide) $(call assert-max-image-size,$(INSTALLED_PRODUCTIMAGE_TARGET),$(BOARD_PRODUCTIMAGE_PARTITION_SIZE))

      $(TARGET_OUT_PRODUCT) $(productimage_intermediates)/product_image_info.txt $(INSTALLED_PRODUCTIMAGE_TARGET) $(TARGET_OUT) \

      $(productimage_intermediates)/generated_product_image_info.txt

  $(hide) $(call assert-max-image-size,$(INSTALLED_PRODUCTIMAGE_TARGET),\

      $(call read-image-prop-dictionary,\

          $(productimage_intermediates)/generated_product_image_info.txt,product_size))

endef



# We just build this directly to the install location.
@@ -2309,10 +2361,6 @@ ifndef BOARD_BOOTIMAGE_PARTITION_SIZE 
  $(error BOARD_BOOTIMAGE_PARTITION_SIZE must be set for BOARD_AVB_ENABLE)

endif



ifndef BOARD_SYSTEMIMAGE_PARTITION_SIZE

  $(error BOARD_SYSTEMIMAGE_PARTITION_SIZE must be set for BOARD_AVB_ENABLE)

endif



# $(1): the directory to extract public keys to

define extract-avb-chain-public-keys

  $(if $(BOARD_AVB_BOOT_KEY_PATH),\
@@ -2377,6 +2425,105 @@ $(eval $(call copy-one-file,$(BOARD_PREBUILT_VBMETAIMAGE),$(INSTALLED_VBMETAIMAG 


endif # BOARD_AVB_ENABLE



# -----------------------------------------------------------------

# super partition image



# (1): list of items like "system", "vendor", "product", "product_services"

# return: map each item to the corresponding image target.

# system => $(BUILT_SYSTEMIMAGE), vendor => $(INSTALLED_VENDORIMAGE_TARGET), etc.

define image-for-partitions

$(foreach item,$(1),$(or $(strip $(foreach mapping,

            system:$(BUILT_SYSTEMIMAGE)

            product_services:$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET),

        $(if $(filter $(call word-colon,1,$(mapping)),$(item)),

            $(patsubst $(call word-colon,1,$(mapping)),$(call word-colon,2,$(mapping)),$(item))))),

    $(INSTALLED_$(call to-upper,$(item)IMAGE_TARGET))))

endef



# (1): list of items like "system", "vendor", "product", "product_services"

# return: map each item into a command ( wrapped in $$() ) that reads the size

define read-size-of-partitions

$(foreach p,$(1),$(call read-image-prop-dictionary,$($(p)image_intermediates)/generated_$(p)_image_info.txt,$(p)_size))

endef



ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION))



# BOARD_SUPER_PARTITION_SIZE must be defined to build super image.

ifdef BOARD_SUPER_PARTITION_SIZE



INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img

$(INSTALLED_SUPERIMAGE_TARGET): $(call image-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))



# For A/B devices, super partition always contains sub-partitions in the _a slot, because this

# image should only be used for bootstrapping / initializing the device. When flashing the image,

# bootloader fastboot should always mark _a slot as bootable.

ifeq ($(AB_OTA_UPDATER),true)

$(INSTALLED_SUPERIMAGE_TARGET): PRIVATE_PARTITION_SUFFIX=_a

$(INSTALLED_SUPERIMAGE_TARGET): PRIVATE_METADATA_SLOTS=2

else

$(INSTALLED_SUPERIMAGE_TARGET): PRIVATE_METADATA_SLOTS=1

endif # AB_OTA_UPDATER





$(INSTALLED_SUPERIMAGE_TARGET): $(HOST_OUT_EXECUTABLES)/lpmake

	$< \

		--sparse \

		--metadata-size 65536 \

		--metadata-slots $(PRIVATE_METADATA_SLOTS) \

		--device-size $(BOARD_SUPER_PARTITION_SIZE) \

		--output $@ \

		$(foreach name,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \

			--partition $(name)$(PRIVATE_PARTITION_SUFFIX):$$($(UUIDGEN) $(name)$(PRIVATE_PARTITION_SUFFIX)):readonly:$(call read-size-of-partitions,$(name)) \

			--image $(name)$(PRIVATE_PARTITION_SUFFIX)=$(call image-for-partitions,$(name)))



$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_TARGET))



endif # BOARD_SUPER_PARTITION_SIZE

endif # PRODUCT_BUILD_SUPER_PARTITION



# -----------------------------------------------------------------

# Check image sizes <= size of super partition



ifeq (,$(TARGET_BUILD_APPS))

# Do not check for apps-only build



ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION))

ifdef BOARD_SUPER_PARTITION_SIZE

ifdef BOARD_SUPER_PARTITION_PARTITION_LIST



droid_targets: check_android_partition_sizes



.PHONY: check_android_partition_sizes



# BOARD_SUPER_PARTITION_PARTITION_LIST: a list of the following tokens

valid_super_partition_list := system vendor product productservices

ifneq (,$(filter-out $(valid_super_partition_list),$(BOARD_SUPER_PARTITION_PARTITION_LIST)))

$(error BOARD_SUPER_PARTITION_PARTITION_LIST contains invalid partition name. \

        Valid names are $(valid_super_partition_list).)

endif

valid_super_partition_list :=



# Add image dependencies so that generated_*_image_info.txt are written before checking.

check_android_partition_sizes: $(call image-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))



check_android_partition_sizes:

	partition_size_list="$(call read-size-of-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))"; \

	sum_sizes_expr=$$(sed -e 's/ /+/g' <<< "$${partition_size_list}"); \

	if [ $$(( $${sum_sizes_expr} )) -gt $(BOARD_SUPER_PARTITION_SIZE) ]; then \

		echo 'The sum of sizes of all logical partitions is larger than BOARD_SUPER_PARTITION_SIZE.'; \

		echo $${sum_sizes_expr} '==' $$(( $${sum_sizes_expr} )) '>' $(BOARD_SUPER_PARTITION_SIZE); \

		exit 1; \

	else \

		echo 'The sum of sizes of all logical partitions is within BOARD_SUPER_PARTITION_SIZE:' \

		    $${sum_sizes_expr} '==' $$(( $${sum_sizes_expr} )) '<=' $(BOARD_SUPER_PARTITION_SIZE); \

	fi



endif # BOARD_SUPER_PARTITION_PARTITION_LIST

endif # BOARD_SUPER_PARTITION_SIZE

endif # PRODUCT_BUILD_SUPER_PARTITION



endif # TARGET_BUILD_APPS



# -----------------------------------------------------------------

# bring in the installer image generation defines if necessary

ifeq ($(TARGET_USE_DISKINSTALLER),true)
@@ -3199,26 +3346,26 @@ ifeq ($(BUILD_QEMU_IMAGES),true) 
INSTALLED_QEMU_SYSTEMIMAGE := $(PRODUCT_OUT)/system-qemu.img

MK_QEMU_IMAGE_SH := device/generic/goldfish/tools/mk_qemu_image.sh

SGDISK_HOST := $(HOST_OUT_EXECUTABLES)/sgdisk

$(INSTALLED_QEMU_SYSTEMIMAGE): $(INSTALLED_SYSTEMIMAGE) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST)

$(INSTALLED_QEMU_SYSTEMIMAGE): $(INSTALLED_SYSTEMIMAGE) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

	@echo Create system-qemu.img

	(export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/system.img)

	(export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/system.img)



systemimage: $(INSTALLED_QEMU_SYSTEMIMAGE)

droidcore: $(INSTALLED_QEMU_SYSTEMIMAGE)

ifeq ($(BOARD_USES_VENDORIMAGE),true)

INSTALLED_QEMU_VENDORIMAGE := $(PRODUCT_OUT)/vendor-qemu.img

$(INSTALLED_QEMU_VENDORIMAGE): $(INSTALLED_VENDORIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST)

$(INSTALLED_QEMU_VENDORIMAGE): $(INSTALLED_VENDORIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

	@echo Create vendor-qemu.img

	(export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/vendor.img)

	(export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/vendor.img)



vendorimage: $(INSTALLED_QEMU_VENDORIMAGE)

droidcore: $(INSTALLED_QEMU_VENDORIMAGE)

endif

ifeq ($(BOARD_USES_PRODUCTIMAGE),true)

INSTALLED_QEMU_PRODUCTIMAGE := $(PRODUCT_OUT)/product-qemu.img

$(INSTALLED_QEMU_PRODUCTIMAGE): $(INSTALLED_PRODUCTIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST)

$(INSTALLED_QEMU_PRODUCTIMAGE): $(INSTALLED_PRODUCTIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

	@echo Create product-qemu.img

	(export SGDISK=$(SGDISK_HOST); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/product.img)

	(export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/product.img)



productimage: $(INSTALLED_QEMU_PRODUCTIMAGE)

droidcore: $(INSTALLED_QEMU_PRODUCTIMAGE)