Merge changes from topic "init_boot_img" (6363a04e) · Commits · e / os / android_build

core/Makefile

+92 −3

Original line number	Diff line number	Diff line
		@@ -908,8 +908,14 @@ ifneq ($(strip $(TARGET_NO_KERNEL)),true)
		INTERNAL_BOOTIMAGE_ARGS := \
		$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET))

		INTERNAL_INIT_BOOT_IMAGE_ARGS :=

		ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
		ifneq ($(BUILDING_INIT_BOOT_IMAGE),true)
		INTERNAL_BOOTIMAGE_ARGS += --ramdisk $(INSTALLED_RAMDISK_TARGET)
		else
		INTERNAL_INIT_BOOT_IMAGE_ARGS += --ramdisk $(INSTALLED_RAMDISK_TARGET)
		endif
		endif

		ifndef BUILDING_VENDOR_BOOT_IMAGE
		@@ -1088,6 +1094,58 @@ endif # my_installed_prebuilt_gki_apex not defined
		my_apex_extracted_boot_image :=
		my_installed_prebuilt_gki_apex :=

		# -----------------------------------------------------------------
		# init boot image
		ifeq ($(BUILDING_INIT_BOOT_IMAGE),true)

		INSTALLED_INIT_BOOT_IMAGE_TARGET := $(PRODUCT_OUT)/init_boot.img
		$(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_RAMDISK_TARGET)

		ifdef BOARD_KERNEL_PAGESIZE
		INTERNAL_INIT_BOOT_IMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)
		endif

		ifeq ($(BOARD_AVB_ENABLE),true)
		$(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(AVBTOOL) $(BOARD_AVB_INIT_BOOT_IMAGE_KEY_PATH)
		$(call pretty,"Target init_boot image: $@")
		$(MKBOOTIMG) $(INTERNAL_INIT_BOOT_IMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_INIT_ARGS) --output $@
		$(call assert-max-image-size,$@,$(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE))
		$(AVBTOOL) add_hash_footer \
		--image $@ \
		--partition_size $(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE) \
		--partition_name init_boot $(INTERNAL_AVB_INIT_BOOT_SIGNING_ARGS) \
		$(BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS)
		else
		$(INSTALLED_INIT_BOOT_IMAGE_TARGET):
		$(call pretty,"Target init_boot image: $@")
		$(MKBOOTIMG) $(INTERNAL_INIT_BOOT_IMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_INIT_ARGS) --output $@
		$(call assert-max-image-size,$@,$(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE))
		endif

		else # BUILDING_INIT_BOOT_IMAGE is not true

		ifdef BOARD_PREBUILT_INIT_BOOT_IMAGE
		INTERNAL_PREBUILT_INIT_BOOT_IMAGE := $(BOARD_PREBUILT_INIT_BOOT_IMAGE)
		INSTALLED_INIT_BOOT_IMAGE_TARGET := $(PRODUCT_OUT)/init_boot.img

		ifeq ($(BOARD_AVB_ENABLE),true)
		$(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(INTERNAL_PREBUILT_INIT_BOOT_IMAGE) $(AVBTOOL) $(BOARD_AVB_INIT_BOOT_KEY_PATH)
		cp $(INTERNAL_PREBUILT_INIT_BOOT_IMAGE) $@
		$(AVBTOOL) add_hash_footer \
		--image $@ \
		--partition_size $(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE) \
		--partition_name boot $(INTERNAL_AVB_INIT_BOOT_SIGNING_ARGS) \
		$(BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS)
		else
		$(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(INTERNAL_PREBUILT_INIT_BOOT_IMAGE)
		cp $(INTERNAL_PREBUILT_INIT_BOOT_IMAGE) $@
		endif # BOARD_AVB_ENABLE

		else # BOARD_PREBUILT_INIT_BOOT_IMAGE not defined
		INSTALLED_INIT_BOOT_IMAGE_TARGET :=
		endif # BOARD_PREBUILT_INIT_BOOT_IMAGE

		endif # BUILDING_INIT_BOOT_IMAGE is not true
		# -----------------------------------------------------------------
		# vendor boot image
		ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)
		@@ -3634,9 +3692,13 @@ BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS += \
		--prop com.android.build.pvmfw.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE)

		# The following vendor- and odm-specific images needs explicit SPL set per board.
		# TODO(b/210875415) Is this security_patch property used? Should it be removed from
		# boot.img when there is no platform ramdisk included in it?
		ifdef BOOT_SECURITY_PATCH
		BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \
		--prop com.android.build.boot.security_patch:$(BOOT_SECURITY_PATCH)
		BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS += \
		--prop com.android.build.init_boot.security_patch:$(BOOT_SECURITY_PATCH)
		endif

		ifdef VENDOR_SECURITY_PATCH
		@@ -3665,6 +3727,7 @@ BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS += \
		endif

		BOOT_FOOTER_ARGS := BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS
		INIT_BOOT_FOOTER_ARGS := BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS
		VENDOR_BOOT_FOOTER_ARGS := BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS
		DTBO_FOOTER_ARGS := BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS
		PVMFW_FOOTER_ARGS := BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS
		@@ -3748,6 +3811,10 @@ ifdef INSTALLED_BOOTIMAGE_TARGET
		$(eval $(call check-and-set-avb-args,boot))
		endif

		ifdef INSTALLED_INIT_BOOT_IMAGE_TARGET
		$(eval $(call check-and-set-avb-args,init_boot))
		endif

		ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET
		$(eval $(call check-and-set-avb-args,vendor_boot))
		endif
		@@ -3844,6 +3911,9 @@ define extract-avb-chain-public-keys
		$(if $(BOARD_AVB_BOOT_KEY_PATH),\
		$(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_BOOT_KEY_PATH) \
		--output $(1)/boot.avbpubkey)
		$(if $(BOARD_AVB_INIT_BOOT_KEY_PATH),\
		$(hide) $(AVBTOOL) extract_public_key --key $(BOARD_AVB_INIT_BOOT_KEY_PATH) \
		--output $(1)/init_boot.avbpubkey)
		$(if $(BOARD_AVB_VENDOR_BOOT_KEY_PATH),\
		$(AVBTOOL) extract_public_key --key $(BOARD_AVB_VENDOR_BOOT_KEY_PATH) \
		--output $(1)/vendor_boot.avbpubkey)
		@@ -3947,6 +4017,7 @@ $(INSTALLED_VBMETAIMAGE_TARGET): PRIVATE_AVB_VBMETA_SIGNING_ARGS := \
		$(INSTALLED_VBMETAIMAGE_TARGET): \
		$(AVBTOOL) \
		$(INSTALLED_BOOTIMAGE_TARGET) \
		$(INSTALLED_INIT_BOOT_IMAGE_TARGET) \
		$(INSTALLED_VENDOR_BOOTIMAGE_TARGET) \
		$(INSTALLED_SYSTEMIMAGE_TARGET) \
		$(INSTALLED_VENDORIMAGE_TARGET) \
		@@ -4518,6 +4589,10 @@ ifeq ($(INSTALLED_BOOTIMAGE_TARGET),)
		else
		echo "boot_images=$(foreach b,$(INSTALLED_BOOTIMAGE_TARGET),$(notdir $(b)))" >> $@
		endif
		ifneq ($(INSTALLED_INIT_BOOT_IMAGE_TARGET),)
		$(hide) echo "init_boot=true" >> $@
		$(hide) echo "init_boot_size=$(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE)" >> $@
		endif
		ifeq ($(BOARD_RAMDISK_USE_LZ4),true)
		echo "lz4_ramdisks=true" >> $@
		endif
		@@ -4551,6 +4626,7 @@ endif
		$(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $@
		$(hide) echo 'recovery_mkbootimg_args=$(BOARD_RECOVERY_MKBOOTIMG_ARGS)' >> $@
		$(hide) echo 'mkbootimg_version_args=$(INTERNAL_MKBOOTIMG_VERSION_ARGS)' >> $@
		$(hide) echo 'mkbootimg_init_args=$(BOARD_MKBOOTIMG_INIT_ARGS)' >> $@
		ifdef BOARD_GKI_SIGNING_KEY_PATH
		$(hide) echo 'gki_signing_key_path=$(BOARD_GKI_SIGNING_KEY_PATH)' >> $@
		$(hide) echo 'gki_signing_algorithm=$(BOARD_GKI_SIGNING_ALGORITHM)' >> $@
		@@ -4928,9 +5004,10 @@ else ifdef BOARD_PREBUILT_SYSTEM_EXTIMAGE
		$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_SYSTEM_EXTIMAGE_TARGET)
		endif

		ifdef BUILDING_BOOT_IMAGE
		ifneq (,$(BUILDING_BOOT_IMAGE)$(BUILDING_INIT_BOOT_IMAGE))
		$(BUILT_TARGET_FILES_PACKAGE): $(INTERNAL_RAMDISK_FILES)
		endif
		endif # BUILDING_BOOT_IMAGE != "" \|\| BUILDING_INIT_BOOT_IMAGE != ""

		ifneq (,$(INTERNAL_PREBUILT_BOOTIMAGE) $(filter true,$(BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES)))
		$(BUILT_TARGET_FILES_PACKAGE): $(INSTALLED_BOOTIMAGE_TARGET)
		endif
		@@ -5252,6 +5329,10 @@ ifdef BOARD_PREBUILT_SYSTEM_EXTIMAGE
		$(hide) mkdir -p $(zip_root)/IMAGES
		$(hide) cp $(INSTALLED_SYSTEM_EXTIMAGE_TARGET) $(zip_root)/IMAGES/
		endif
		ifdef BOARD_PREBUILT_INIT_BOOT_IMAGE
		$(hide) mkdir -p $(zip_root)/IMAGES
		$(hide) cp $(INSTALLED_INIT_BOOT_IMAGE_TARGET) $(zip_root)/IMAGES/
		endif
		ifndef BOARD_PREBUILT_BOOTIMAGE
		ifneq (,$(INTERNAL_PREBUILT_BOOTIMAGE) $(filter true,$(BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES)))
		ifdef INSTALLED_BOOTIMAGE_TARGET
		@@ -5329,6 +5410,13 @@ ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
		@# BOOT/RAMDISK exists and contains the ramdisk for recovery if using BOARD_USES_RECOVERY_AS_BOOT.
		$(hide) $(call fs_config,$(zip_root)/BOOT/RAMDISK,) > $(zip_root)/META/boot_filesystem_config.txt
		endif
		ifdef BUILDING_INIT_BOOT_IMAGE
		$(hide) $(call package_files-copy-root, $(TARGET_RAMDISK_OUT),$(zip_root)/INIT_BOOT/RAMDISK)
		$(hide) $(call fs_config,$(zip_root)/INIT_BOOT/RAMDISK,) > $(zip_root)/META/init_boot_filesystem_config.txt
		ifdef BOARD_KERNEL_PAGESIZE
		$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/INIT_BOOT/pagesize
		endif # BOARD_KERNEL_PAGESIZE
		endif # BUILDING_INIT_BOOT_IMAGE
		ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)
		$(call fs_config,$(zip_root)/VENDOR_BOOT/RAMDISK,) > $(zip_root)/META/vendor_boot_filesystem_config.txt
		endif
		@@ -5642,6 +5730,7 @@ $(PROGUARD_USAGE_ZIP): \
		$(INSTALLED_SYSTEMIMAGE_TARGET) \
		$(INSTALLED_RAMDISK_TARGET) \
		$(INSTALLED_BOOTIMAGE_TARGET) \
		$(INSTALLED_INIT_BOOT_IMAGE_TARGET) \
		$(INSTALLED_USERDATAIMAGE_TARGET) \
		$(INSTALLED_VENDORIMAGE_TARGET) \
		$(INSTALLED_PRODUCTIMAGE_TARGET) \

core/board_config.mk

+28 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ _board_strip_readonly_list += TARGET_ARCH_SUITE
		# File system variables
		_board_strip_readonly_list += BOARD_FLASH_BLOCK_SIZE
		_board_strip_readonly_list += BOARD_BOOTIMAGE_PARTITION_SIZE
		_board_strip_readonly_list += BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE
		_board_strip_readonly_list += BOARD_RECOVERYIMAGE_PARTITION_SIZE
		_board_strip_readonly_list += BOARD_SYSTEMIMAGE_PARTITION_SIZE
		_board_strip_readonly_list += BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE
		@@ -122,6 +123,9 @@ _board_strip_readonly_list += BOARD_INCLUDE_RECOVERY_RAMDISK_IN_VENDOR_BOOT
		_board_strip_readonly_list += BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT
		_board_strip_readonly_list += BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES

		# Prebuilt image variables
		_board_strip_readonly_list += BOARD_PREBUILT_INIT_BOOT_IMAGE

		# Defines the list of logical vendor ramdisk names to build or include in vendor_boot.
		_board_strip_readonly_list += BOARD_VENDOR_RAMDISK_FRAGMENTS

		@@ -461,6 +465,25 @@ else ifeq ($(PRODUCT_BUILD_BOOT_IMAGE),true)
		endif
		.KATI_READONLY := BUILDING_BOOT_IMAGE

		# Are we building an init boot image
		BUILDING_INIT_BOOT_IMAGE :=
		ifeq ($(PRODUCT_BUILD_INIT_BOOT_IMAGE),)
		ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
		BUILDING_INIT_BOOT_IMAGE :=
		else ifdef BOARD_PREBUILT_INIT_BOOT_IMAGE
		BUILDING_INIT_BOOT_IMAGE :=
		else ifdef BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE
		BUILDING_INIT_BOOT_IMAGE := true
		endif
		else ifeq ($(PRODUCT_BUILD_INIT_BOOT_IMAGE),true)
		ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
		$(error PRODUCT_BUILD_INIT_BOOT_IMAGE is true, but so is BOARD_USES_RECOVERY_AS_BOOT. Use only one option.)
		else
		BUILDING_INIT_BOOT_IMAGE := true
		endif
		endif
		.KATI_READONLY := BUILDING_INIT_BOOT_IMAGE

		# Are we building a recovery image
		BUILDING_RECOVERY_IMAGE :=
		ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),)
		@@ -569,6 +592,11 @@ else ifndef _has_boot_img_artifact
		$(warning PRODUCT_BUILD_DEBUG_BOOT_IMAGE is true, but we're not building a boot image. \
		Skip building the debug boot image.)
		endif
		else ifdef BUILDING_INIT_BOOT_IMAGE
		ifeq ($(PRODUCT_BUILD_DEBUG_BOOT_IMAGE),true)
		$(warning PRODUCT_BUILD_DEBUG_BOOT_IMAGE is true, but we don't have a ramdisk in the boot image. \
		Skip building the debug boot image.)
		endif
		else
		ifeq ($(PRODUCT_BUILD_DEBUG_BOOT_IMAGE),)
		BUILDING_DEBUG_BOOT_IMAGE := true

core/main.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -1603,6 +1603,9 @@ superimage_empty: $(INSTALLED_SUPERIMAGE_EMPTY_TARGET)
		.PHONY: bootimage
		bootimage: $(INSTALLED_BOOTIMAGE_TARGET)

		.PHONY: initbootimage
		bootimage: $(INSTALLED_INIT_BOOT_IMAGE_TARGET)

		ifeq (true,$(PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST))
		$(call dist-for-goals, bootimage, $(INSTALLED_BOOTIMAGE_TARGET))
		endif
		@@ -1629,6 +1632,7 @@ droidcore-unbundled: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \
		$(INSTALLED_SYSTEMIMAGE_TARGET) \
		$(INSTALLED_RAMDISK_TARGET) \
		$(INSTALLED_BOOTIMAGE_TARGET) \
		$(INSTALLED_INIT_BOOT_IMAGE_TARGET) \
		$(INSTALLED_RADIOIMAGE_TARGET) \
		$(INSTALLED_DEBUG_RAMDISK_TARGET) \
		$(INSTALLED_DEBUG_BOOTIMAGE_TARGET) \

core/product.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -395,6 +395,7 @@ _product_single_value_vars += PRODUCT_BUILD_RAMDISK_IMAGE
		_product_single_value_vars += PRODUCT_BUILD_USERDATA_IMAGE
		_product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE
		_product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE
		_product_single_value_vars += PRODUCT_BUILD_INIT_BOOT_IMAGE
		_product_single_value_vars += PRODUCT_BUILD_DEBUG_BOOT_IMAGE
		_product_single_value_vars += PRODUCT_BUILD_VENDOR_BOOT_IMAGE
		_product_single_value_vars += PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE

tools/releasetools/add_img_to_target_files.py

+12 −0

Original line number	Diff line number	Diff line
		@@ -759,6 +759,7 @@ def AddImagesToTargetFiles(filename):

		has_recovery = OPTIONS.info_dict.get("no_recovery") != "true"
		has_boot = OPTIONS.info_dict.get("no_boot") != "true"
		has_init_boot = OPTIONS.info_dict.get("init_boot") == "true"
		has_vendor_boot = OPTIONS.info_dict.get("vendor_boot") == "true"

		# {vendor,odm,product,system_ext,vendor_dlkm,odm_dlkm, system, system_other}.img
		@@ -819,6 +820,17 @@ def AddImagesToTargetFiles(filename):
		if output_zip:
		boot_image.AddToZip(output_zip)

		if has_init_boot:
		banner("init_boot")
		init_boot_image = common.GetBootableImage(
		"IMAGES/init_boot.img", "init_boot.img", OPTIONS.input_tmp, "INIT_BOOT")
		if init_boot_image:
		partitions['init_boot'] = os.path.join(OPTIONS.input_tmp, "IMAGES", "init_boot.img")
		if not os.path.exists(partitions['init_boot']):
		init_boot_image.WriteToDir(OPTIONS.input_tmp)
		if output_zip:
		init_boot_image.AddToZip(output_zip)

		if has_vendor_boot:
		banner("vendor_boot")
		vendor_boot_image = common.GetVendorBootImage(