Merge "Writes misc_info.txt in o/t/p without requiring 'm dist'."
This commit is contained in:
Daniel Norman
Gerrit Code Review
commit
b74fa6cf97
1 changed files with 135 additions and 118 deletions
253
core/Makefile
253
core/Makefile
|
|
@ -3684,6 +3684,139 @@ otatools-package: $(BUILT_OTATOOLS_PACKAGE)
|
|||
|
||||
endif # build_otatools_package
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# misc_info.txt
|
||||
|
||||
INSTALLED_MISC_INFO_TARGET := $(PRODUCT_OUT)/misc_info.txt
|
||||
|
||||
ifeq ($(TARGET_RELEASETOOLS_EXTENSIONS),)
|
||||
# default to common dir for device vendor
|
||||
tool_extensions := $(TARGET_DEVICE_DIR)/../common
|
||||
else
|
||||
tool_extensions := $(TARGET_RELEASETOOLS_EXTENSIONS)
|
||||
endif
|
||||
.KATI_READONLY := tool_extensions
|
||||
|
||||
$(INSTALLED_MISC_INFO_TARGET):
|
||||
rm -f $@
|
||||
$(call pretty,"Target misc_info.txt: $@")
|
||||
$(hide) echo "recovery_api_version=$(RECOVERY_API_VERSION)" >> $@
|
||||
$(hide) echo "fstab_version=$(RECOVERY_FSTAB_VERSION)" >> $@
|
||||
ifdef BOARD_FLASH_BLOCK_SIZE
|
||||
$(hide) echo "blocksize=$(BOARD_FLASH_BLOCK_SIZE)" >> $@
|
||||
endif
|
||||
ifdef BOARD_BOOTIMAGE_PARTITION_SIZE
|
||||
$(hide) echo "boot_size=$(BOARD_BOOTIMAGE_PARTITION_SIZE)" >> $@
|
||||
endif
|
||||
ifeq ($(INSTALLED_BOOTIMAGE_TARGET),)
|
||||
$(hide) echo "no_boot=true" >> $@
|
||||
endif
|
||||
ifeq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
|
||||
$(hide) echo "no_recovery=true" >> $@
|
||||
endif
|
||||
ifdef BOARD_INCLUDE_RECOVERY_DTBO
|
||||
$(hide) echo "include_recovery_dtbo=true" >> $@
|
||||
endif
|
||||
ifdef BOARD_INCLUDE_RECOVERY_ACPIO
|
||||
$(hide) echo "include_recovery_acpio=true" >> $@
|
||||
endif
|
||||
ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE
|
||||
$(hide) echo "recovery_size=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)" >> $@
|
||||
endif
|
||||
ifdef TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
|
||||
@# TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS can be empty to indicate that nothing but defaults should be used.
|
||||
$(hide) echo "recovery_mount_options=$(TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $@
|
||||
else
|
||||
$(hide) echo "recovery_mount_options=$(DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $@
|
||||
endif
|
||||
$(hide) echo "tool_extensions=$(tool_extensions)" >> $@
|
||||
$(hide) echo "default_system_dev_certificate=$(DEFAULT_SYSTEM_DEV_CERTIFICATE)" >> $@
|
||||
ifdef PRODUCT_EXTRA_RECOVERY_KEYS
|
||||
$(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $@
|
||||
endif
|
||||
$(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $@
|
||||
$(hide) echo 'mkbootimg_version_args=$(INTERNAL_MKBOOTIMG_VERSION_ARGS)' >> $@
|
||||
$(hide) echo "multistage_support=1" >> $@
|
||||
$(hide) echo "blockimgdiff_versions=3,4" >> $@
|
||||
ifeq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
|
||||
$(hide) echo "build_generic_ota_package=true" >> $@
|
||||
endif
|
||||
ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
|
||||
# OTA scripts are only interested in fingerprint related properties
|
||||
$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $@
|
||||
endif
|
||||
ifneq (,$(filter address, $(SANITIZE_TARGET)))
|
||||
# We need to create userdata.img with real data because the instrumented libraries are in userdata.img.
|
||||
$(hide) echo "userdata_img_with_data=true" >> $@
|
||||
endif
|
||||
ifeq ($(BOARD_USES_FULL_RECOVERY_IMAGE),true)
|
||||
$(hide) echo "full_recovery_image=true" >> $@
|
||||
endif
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
$(hide) echo "avb_enable=true" >> $@
|
||||
$(hide) echo "avb_vbmeta_key_path=$(BOARD_AVB_KEY_PATH)" >> $@
|
||||
$(hide) echo "avb_vbmeta_algorithm=$(BOARD_AVB_ALGORITHM)" >> $@
|
||||
$(hide) echo "avb_vbmeta_args=$(BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS)" >> $@
|
||||
$(hide) echo "avb_boot_add_hash_footer_args=$(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS)" >> $@
|
||||
ifdef BOARD_AVB_BOOT_KEY_PATH
|
||||
$(hide) echo "avb_boot_key_path=$(BOARD_AVB_BOOT_KEY_PATH)" >> $@
|
||||
$(hide) echo "avb_boot_algorithm=$(BOARD_AVB_BOOT_ALGORITHM)" >> $@
|
||||
$(hide) echo "avb_boot_rollback_index_location=$(BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION)" >> $@
|
||||
endif # BOARD_AVB_BOOT_KEY_PATH
|
||||
$(hide) echo "avb_recovery_add_hash_footer_args=$(BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS)" >> $@
|
||||
ifdef BOARD_AVB_RECOVERY_KEY_PATH
|
||||
$(hide) echo "avb_recovery_key_path=$(BOARD_AVB_RECOVERY_KEY_PATH)" >> $@
|
||||
$(hide) echo "avb_recovery_algorithm=$(BOARD_AVB_RECOVERY_ALGORITHM)" >> $@
|
||||
$(hide) echo "avb_recovery_rollback_index_location=$(BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION)" >> $@
|
||||
endif # BOARD_AVB_RECOVERY_KEY_PATH
|
||||
ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM)))
|
||||
$(hide) echo "avb_vbmeta_system=$(BOARD_AVB_VBMETA_SYSTEM)" >> $@
|
||||
$(hide) echo "avb_vbmeta_system_args=$(BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS)" >> $@
|
||||
$(hide) echo "avb_vbmeta_system_key_path=$(BOARD_AVB_VBMETA_SYSTEM_KEY_PATH)" >> $@
|
||||
$(hide) echo "avb_vbmeta_system_algorithm=$(BOARD_AVB_VBMETA_SYSTEM_ALGORITHM)" >> $@
|
||||
$(hide) echo "avb_vbmeta_system_rollback_index_location=$(BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION)" >> $@
|
||||
endif # BOARD_AVB_VBMETA_SYSTEM
|
||||
ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR)))
|
||||
$(hide) echo "avb_vbmeta_vendor=$(BOARD_AVB_VBMETA_VENDOR)" >> $@
|
||||
$(hide) echo "avb_vbmeta_vendor_args=$(BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS)" >> $@
|
||||
$(hide) echo "avb_vbmeta_vendor_key_path=$(BOARD_AVB_VBMETA_VENDOR_KEY_PATH)" >> $@
|
||||
$(hide) echo "avb_vbmeta_vendor_algorithm=$(BOARD_AVB_VBMETA_VENDOR_ALGORITHM)" >> $@
|
||||
$(hide) echo "avb_vbmeta_vendor_rollback_index_location=$(BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION)" >> $@
|
||||
endif # BOARD_AVB_VBMETA_VENDOR_KEY_PATH
|
||||
endif # BOARD_AVB_ENABLE
|
||||
ifdef BOARD_BPT_INPUT_FILES
|
||||
$(hide) echo "board_bpt_enable=true" >> $@
|
||||
$(hide) echo "board_bpt_make_table_args=$(BOARD_BPT_MAKE_TABLE_ARGS)" >> $@
|
||||
$(hide) echo "board_bpt_input_files=$(BOARD_BPT_INPUT_FILES)" >> $@
|
||||
endif
|
||||
ifdef BOARD_BPT_DISK_SIZE
|
||||
$(hide) echo "board_bpt_disk_size=$(BOARD_BPT_DISK_SIZE)" >> $@
|
||||
endif
|
||||
$(call generate-userimage-prop-dictionary, $@)
|
||||
ifeq ($(AB_OTA_UPDATER),true)
|
||||
@# Include the build type in META/misc_info.txt so the server can easily differentiate production builds.
|
||||
$(hide) echo "build_type=$(TARGET_BUILD_VARIANT)" >> $@
|
||||
$(hide) echo "ab_update=true" >> $@
|
||||
endif
|
||||
ifdef BOARD_PREBUILT_DTBOIMAGE
|
||||
$(hide) echo "has_dtbo=true" >> $@
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
$(hide) echo "dtbo_size=$(BOARD_DTBOIMG_PARTITION_SIZE)" >> $@
|
||||
$(hide) echo "avb_dtbo_add_hash_footer_args=$(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)" >> $@
|
||||
ifdef BOARD_AVB_DTBO_KEY_PATH
|
||||
$(hide) echo "avb_dtbo_key_path=$(BOARD_AVB_DTBO_KEY_PATH)" >> $@
|
||||
$(hide) echo "avb_dtbo_algorithm=$(BOARD_AVB_DTBO_ALGORITHM)" >> $@
|
||||
$(hide) echo "avb_dtbo_rollback_index_location=$(BOARD_AVB_DTBO_ROLLBACK_INDEX_LOCATION)" >> $@
|
||||
endif # BOARD_AVB_DTBO_KEY_PATH
|
||||
endif # BOARD_AVB_ENABLE
|
||||
endif # BOARD_PREBUILT_DTBOIMAGE
|
||||
$(call dump-dynamic-partitions-info,$@)
|
||||
|
||||
.PHONY: misc_info
|
||||
misc_info: $(INSTALLED_MISC_INFO_TARGET)
|
||||
|
||||
droidcore: $(INSTALLED_MISC_INFO_TARGET)
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# A zip of the directories that map to the target filesystem.
|
||||
# This zip can be used to create an OTA package or filesystem image
|
||||
|
|
@ -3721,17 +3854,7 @@ endif
|
|||
|
||||
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)
|
||||
|
||||
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_API_VERSION := $(RECOVERY_API_VERSION)
|
||||
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_RECOVERY_FSTAB_VERSION := $(RECOVERY_FSTAB_VERSION)
|
||||
|
||||
ifeq ($(TARGET_RELEASETOOLS_EXTENSIONS),)
|
||||
# default to common dir for device vendor
|
||||
tool_extensions := $(TARGET_DEVICE_DIR)/../common
|
||||
else
|
||||
tool_extensions := $(TARGET_RELEASETOOLS_EXTENSIONS)
|
||||
endif
|
||||
tool_extension := $(wildcard $(tool_extensions)/releasetools.py)
|
||||
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_TOOL_EXTENSIONS := $(tool_extensions)
|
||||
$(BUILT_TARGET_FILES_PACKAGE): PRIVATE_TOOL_EXTENSION := $(tool_extension)
|
||||
|
||||
ifeq ($(AB_OTA_UPDATER),true)
|
||||
|
|
@ -3831,6 +3954,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
|
|||
$(PRODUCT_ODM_BASE_FS_PATH) \
|
||||
$(LPMAKE) \
|
||||
$(SELINUX_FC) \
|
||||
$(INSTALLED_MISC_INFO_TARGET) \
|
||||
$(APKCERTS_FILE) \
|
||||
$(SOONG_APEX_KEYS_FILE) \
|
||||
$(SOONG_ZIP) \
|
||||
|
|
@ -3972,51 +4096,7 @@ ifneq ($(tool_extension),)
|
|||
endif
|
||||
$(hide) echo "$(PRODUCT_OTA_PUBLIC_KEYS)" > $(zip_root)/META/otakeys.txt
|
||||
$(hide) cp $(SELINUX_FC) $(zip_root)/META/file_contexts.bin
|
||||
$(hide) echo "recovery_api_version=$(PRIVATE_RECOVERY_API_VERSION)" > $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "fstab_version=$(PRIVATE_RECOVERY_FSTAB_VERSION)" >> $(zip_root)/META/misc_info.txt
|
||||
ifdef BOARD_FLASH_BLOCK_SIZE
|
||||
$(hide) echo "blocksize=$(BOARD_FLASH_BLOCK_SIZE)" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifdef BOARD_BOOTIMAGE_PARTITION_SIZE
|
||||
$(hide) echo "boot_size=$(BOARD_BOOTIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifeq ($(INSTALLED_BOOTIMAGE_TARGET),)
|
||||
$(hide) echo "no_boot=true" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifeq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
|
||||
$(hide) echo "no_recovery=true" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifdef BOARD_INCLUDE_RECOVERY_DTBO
|
||||
$(hide) echo "include_recovery_dtbo=true" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifdef BOARD_INCLUDE_RECOVERY_ACPIO
|
||||
$(hide) echo "include_recovery_acpio=true" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE
|
||||
$(hide) echo "recovery_size=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifdef TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
|
||||
@# TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS can be empty to indicate that nothing but defaults should be used.
|
||||
$(hide) echo "recovery_mount_options=$(TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt
|
||||
else
|
||||
$(hide) echo "recovery_mount_options=$(DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
$(hide) echo "tool_extensions=$(PRIVATE_TOOL_EXTENSIONS)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "default_system_dev_certificate=$(DEFAULT_SYSTEM_DEV_CERTIFICATE)" >> $(zip_root)/META/misc_info.txt
|
||||
ifdef PRODUCT_EXTRA_RECOVERY_KEYS
|
||||
$(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
$(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo 'mkbootimg_version_args=$(INTERNAL_MKBOOTIMG_VERSION_ARGS)' >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "blockimgdiff_versions=3,4" >> $(zip_root)/META/misc_info.txt
|
||||
ifeq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
|
||||
$(hide) echo "build_generic_ota_package=true" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
|
||||
# OTA scripts are only interested in fingerprint related properties
|
||||
$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
$(hide) cp $(INSTALLED_MISC_INFO_TARGET) $(zip_root)/META/misc_info.txt
|
||||
ifneq ($(PRODUCT_SYSTEM_BASE_FS_PATH),)
|
||||
$(hide) cp $(PRODUCT_SYSTEM_BASE_FS_PATH) \
|
||||
$(zip_root)/META/$(notdir $(PRODUCT_SYSTEM_BASE_FS_PATH))
|
||||
|
|
@ -4037,54 +4117,6 @@ ifneq ($(PRODUCT_ODM_BASE_FS_PATH),)
|
|||
$(hide) cp $(PRODUCT_ODM_BASE_FS_PATH) \
|
||||
$(zip_root)/META/$(notdir $(PRODUCT_ODM_BASE_FS_PATH))
|
||||
endif
|
||||
ifneq (,$(filter address, $(SANITIZE_TARGET)))
|
||||
# We need to create userdata.img with real data because the instrumented libraries are in userdata.img.
|
||||
$(hide) echo "userdata_img_with_data=true" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifeq ($(BOARD_USES_FULL_RECOVERY_IMAGE),true)
|
||||
$(hide) echo "full_recovery_image=true" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
$(hide) echo "avb_enable=true" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_key_path=$(BOARD_AVB_KEY_PATH)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_algorithm=$(BOARD_AVB_ALGORITHM)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_args=$(BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_boot_add_hash_footer_args=$(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS)" >> $(zip_root)/META/misc_info.txt
|
||||
ifdef BOARD_AVB_BOOT_KEY_PATH
|
||||
$(hide) echo "avb_boot_key_path=$(BOARD_AVB_BOOT_KEY_PATH)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_boot_algorithm=$(BOARD_AVB_BOOT_ALGORITHM)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_boot_rollback_index_location=$(BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION)" >> $(zip_root)/META/misc_info.txt
|
||||
endif # BOARD_AVB_BOOT_KEY_PATH
|
||||
$(hide) echo "avb_recovery_add_hash_footer_args=$(BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS)" >> $(zip_root)/META/misc_info.txt
|
||||
ifdef BOARD_AVB_RECOVERY_KEY_PATH
|
||||
$(hide) echo "avb_recovery_key_path=$(BOARD_AVB_RECOVERY_KEY_PATH)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_recovery_algorithm=$(BOARD_AVB_RECOVERY_ALGORITHM)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_recovery_rollback_index_location=$(BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION)" >> $(zip_root)/META/misc_info.txt
|
||||
endif # BOARD_AVB_RECOVERY_KEY_PATH
|
||||
ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM)))
|
||||
$(hide) echo "avb_vbmeta_system=$(BOARD_AVB_VBMETA_SYSTEM)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_system_args=$(BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_system_key_path=$(BOARD_AVB_VBMETA_SYSTEM_KEY_PATH)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_system_algorithm=$(BOARD_AVB_VBMETA_SYSTEM_ALGORITHM)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_system_rollback_index_location=$(BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION)" >> $(zip_root)/META/misc_info.txt
|
||||
endif # BOARD_AVB_VBMETA_SYSTEM
|
||||
ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR)))
|
||||
$(hide) echo "avb_vbmeta_vendor=$(BOARD_AVB_VBMETA_VENDOR)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_vendor_args=$(BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_vendor_key_path=$(BOARD_AVB_VBMETA_VENDOR_KEY_PATH)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_vendor_algorithm=$(BOARD_AVB_VBMETA_VENDOR_ALGORITHM)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_vbmeta_vendor_rollback_index_location=$(BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION)" >> $(zip_root)/META/misc_info.txt
|
||||
endif # BOARD_AVB_VBMETA_VENDOR_KEY_PATH
|
||||
endif # BOARD_AVB_ENABLE
|
||||
ifdef BOARD_BPT_INPUT_FILES
|
||||
$(hide) echo "board_bpt_enable=true" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "board_bpt_make_table_args=$(BOARD_BPT_MAKE_TABLE_ARGS)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "board_bpt_input_files=$(BOARD_BPT_INPUT_FILES)" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
ifdef BOARD_BPT_DISK_SIZE
|
||||
$(hide) echo "board_bpt_disk_size=$(BOARD_BPT_DISK_SIZE)" >> $(zip_root)/META/misc_info.txt
|
||||
endif
|
||||
$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
|
||||
ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
|
||||
ifdef BUILDING_SYSTEM_IMAGE
|
||||
$(hide) PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \
|
||||
|
|
@ -4100,9 +4132,6 @@ ifeq ($(AB_OTA_UPDATER),true)
|
|||
$(hide) for conf in $(AB_OTA_POSTINSTALL_CONFIG); do \
|
||||
echo "$${conf}" >> $(zip_root)/META/postinstall_config.txt; \
|
||||
done
|
||||
@# Include the build type in META/misc_info.txt so the server can easily differentiate production builds.
|
||||
$(hide) echo "build_type=$(TARGET_BUILD_VARIANT)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "ab_update=true" >> $(zip_root)/META/misc_info.txt
|
||||
ifdef OSRELEASED_DIRECTORY
|
||||
$(hide) cp $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY)/product_id $(zip_root)/META/product_id.txt
|
||||
$(hide) cp $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY)/product_version $(zip_root)/META/product_version.txt
|
||||
|
|
@ -4136,19 +4165,7 @@ endif
|
|||
ifdef BOARD_PREBUILT_DTBOIMAGE
|
||||
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
|
||||
$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
|
||||
$(hide) echo "has_dtbo=true" >> $(zip_root)/META/misc_info.txt
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
$(hide) echo "dtbo_size=$(BOARD_DTBOIMG_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_dtbo_add_hash_footer_args=$(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)" >> $(zip_root)/META/misc_info.txt
|
||||
ifdef BOARD_AVB_DTBO_KEY_PATH
|
||||
$(hide) echo "avb_dtbo_key_path=$(BOARD_AVB_DTBO_KEY_PATH)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_dtbo_algorithm=$(BOARD_AVB_DTBO_ALGORITHM)" >> $(zip_root)/META/misc_info.txt
|
||||
$(hide) echo "avb_dtbo_rollback_index_location=$(BOARD_AVB_DTBO_ROLLBACK_INDEX_LOCATION)" \
|
||||
>> $(zip_root)/META/misc_info.txt
|
||||
endif # BOARD_AVB_DTBO_KEY_PATH
|
||||
endif # BOARD_AVB_ENABLE
|
||||
endif # BOARD_PREBUILT_DTBOIMAGE
|
||||
$(call dump-dynamic-partitions-info,$(zip_root)/META/misc_info.txt)
|
||||
@# The radio images in BOARD_PACK_RADIOIMAGES will be additionally copied from RADIO/ into
|
||||
@# IMAGES/, which then will be added into <product>-img.zip. Such images must be listed in
|
||||
@# INSTALLED_RADIOIMAGE_TARGET.
|
||||
|
|
|
|||
Loading…
Reference in a new issue