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

Commit bf11e348 authored by hungweichen's avatar hungweichen
Browse files

Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference 

PRODUCT_SUPPORTS_VERITY and PRODUCT_SUPPORTS_VERITY_FEC are going to be
deprecated since we removed VB 1.0 support. This change removes the
related references.

Bug: 241044073
Test: atest under build/make
Change-Id: Icee659ff0606cda1ab44e92372d86a394ddf1466
parent b2dd6834

core/Makefile

+2 −31
Original line number Diff line number Diff line
@@ -984,14 +984,8 @@ endif 


INTERNAL_BOOTIMAGE_FILES := $(filter-out --%,$(INTERNAL_BOOTIMAGE_ARGS))



ifeq ($(PRODUCT_SUPPORTS_VERITY),true)

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

VERITY_KEYID := veritykeyid=id:`openssl x509 -in $(PRODUCT_VERITY_SIGNING_KEY).x509.pem -text \

                | grep keyid | sed 's/://g' | tr -d '[:space:]' | tr '[:upper:]' '[:lower:]' | sed 's/keyid//g'`

endif

endif



INTERNAL_KERNEL_CMDLINE := $(strip $(INTERNAL_KERNEL_CMDLINE) buildvariant=$(TARGET_BUILD_VARIANT) $(VERITY_KEYID))

# TODO(b/241346584) Remove this when BOARD_BUILD_SYSTEM_ROOT_IMAGE is deprecated

INTERNAL_KERNEL_CMDLINE := $(strip $(INTERNAL_KERNEL_CMDLINE) buildvariant=$(TARGET_BUILD_VARIANT))



# kernel cmdline/base/pagesize in boot.

# - If using GKI, use GENERIC_KERNEL_CMDLINE. Remove kernel base and pagesize because they are
@@ -1262,10 +1256,6 @@ endif # BUILDING_INIT_BOOT_IMAGE is not true 
INSTALLED_FILES_OUTSIDE_IMAGES := $(filter-out $(TARGET_VENDOR_RAMDISK_OUT)/%, $(INSTALLED_FILES_OUTSIDE_IMAGES))

ifeq ($(BUILDING_VENDOR_BOOT_IMAGE),true)



ifeq ($(PRODUCT_SUPPORTS_VERITY),true)

  $(error vboot 1.0 does not support vendor_boot partition)

endif



INTERNAL_VENDOR_RAMDISK_FILES := $(filter $(TARGET_VENDOR_RAMDISK_OUT)/%, \

    $(ALL_DEFAULT_INSTALLED_MODULES))
@@ -1786,13 +1776,6 @@ ifneq ($(filter \ 
INTERNAL_USERIMAGES_DEPS += $(MKSQUASHFSUSERIMG)

endif



ifeq (true,$(PRODUCT_SUPPORTS_VERITY))

INTERNAL_USERIMAGES_DEPS += $(BUILD_VERITY_METADATA) $(BUILD_VERITY_TREE) $(APPEND2SIMG) $(VERITY_SIGNER)

ifeq (true,$(PRODUCT_SUPPORTS_VERITY_FEC))

INTERNAL_USERIMAGES_DEPS += $(FEC)

endif

endif



ifeq ($(BOARD_AVB_ENABLE),true)

INTERNAL_USERIMAGES_DEPS += $(AVBTOOL)

endif
@@ -1809,14 +1792,6 @@ SELINUX_FC := $(call intermediates-dir-for,ETC,file_contexts.bin)/file_contexts. 


INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC)



ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))



ifeq ($(PRODUCT_SUPPORTS_VERITY),true)

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

endif



endif # PRODUCT_USE_DYNAMIC_PARTITIONS



# $(1) the partition name (eg system)

# $(2) the image prop file

define add-common-flags-to-image-props
@@ -1926,10 +1901,6 @@ $(if $(BOARD_EROFS_USE_LEGACY_COMPRESSION),$(hide) echo "erofs_use_legacy_compre 
$(if $(BOARD_EXT4_SHARE_DUP_BLOCKS),$(hide) echo "ext4_share_dup_blocks=$(BOARD_EXT4_SHARE_DUP_BLOCKS)" >> $(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 $(PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity=$(PRODUCT_SUPPORTS_VERITY)" >> $(1))

$(if $(PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_key=$(PRODUCT_VERITY_SIGNING_KEY)" >> $(1))

$(if $(PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_signer_cmd=$(notdir $(VERITY_SIGNER))" >> $(1))

$(if $(PRODUCT_SUPPORTS_VERITY_FEC),$(hide) echo "verity_fec=$(PRODUCT_SUPPORTS_VERITY_FEC)" >> $(1))

$(if $(filter eng, $(TARGET_BUILD_VARIANT)),$(hide) echo "verity_disable=true" >> $(1))

$(if $(PRODUCT_SYSTEM_VERITY_PARTITION),$(hide) echo "system_verity_block_device=$(PRODUCT_SYSTEM_VERITY_PARTITION)" >> $(1))

$(if $(PRODUCT_VENDOR_VERITY_PARTITION),$(hide) echo "vendor_verity_block_device=$(PRODUCT_VENDOR_VERITY_PARTITION)" >> $(1))

core/config.mk

+2 −1
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ $(KATI_obsolete_var TARGET_NO_VENDOR_BOOT,Use PRODUCT_BUILD_VENDOR_BOOT_IMAGE in 
$(KATI_obsolete_var PRODUCT_CHECK_ELF_FILES,Use BUILD_BROKEN_PREBUILT_ELF_FILES instead)

$(KATI_obsolete_var ALL_GENERATED_SOURCES,ALL_GENERATED_SOURCES is no longer used)

$(KATI_obsolete_var ALL_ORIGINAL_DYNAMIC_BINARIES,ALL_ORIGINAL_DYNAMIC_BINARIES is no longer used)

$(KATI_obsolete_var PRODUCT_SUPPORTS_VERITY,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var PRODUCT_SUPPORTS_VERITY_FEC,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var PRODUCT_SUPPORTS_BOOT_SIGNER,VB 1.0 and related variables are no longer supported)

# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE
@@ -631,7 +633,6 @@ BUILD_VERITY_METADATA := $(HOST_OUT_EXECUTABLES)/build_verity_metadata 
BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree

FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host

VBOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/vboot_signer

FEC := $(HOST_OUT_EXECUTABLES)/fec



DEXDUMP := $(HOST_OUT_EXECUTABLES)/dexdump$(BUILD_EXECUTABLE_SUFFIX)

PROFMAN := $(HOST_OUT_EXECUTABLES)/profman

core/product.mk

+0 −2
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ _product_list_vars += PRODUCT_BOOT_JARS 
_product_list_vars += PRODUCT_BOOT_JARS_EXTRA



_product_single_value_vars += PRODUCT_SUPPORTS_VBOOT

_product_single_value_vars += PRODUCT_SUPPORTS_VERITY

_product_single_value_vars += PRODUCT_SUPPORTS_VERITY_FEC

_product_list_vars += PRODUCT_SYSTEM_SERVER_APPS

# List of system_server classpath jars on the platform.

_product_list_vars += PRODUCT_SYSTEM_SERVER_JARS

core/tasks/build_custom_images.mk

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ custom_image_parameter_variables := \ 
  CUSTOM_IMAGE_MODULES \

  CUSTOM_IMAGE_COPY_FILES \

  CUSTOM_IMAGE_SELINUX \

  CUSTOM_IMAGE_SUPPORT_VERITY \

  CUSTOM_IMAGE_SUPPORT_VERITY_FEC \

  CUSTOM_IMAGE_VERITY_BLOCK_DEVICE \

  CUSTOM_IMAGE_AVB_HASH_ENABLE \

  CUSTOM_IMAGE_AVB_ADD_HASH_FOOTER_ARGS \

core/tasks/tools/build_custom_image.mk

+0 −12
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ $(my_built_custom_image): PRIVATE_STAGING_DIR := $(my_staging_dir) 
$(my_built_custom_image): PRIVATE_COPY_PAIRS := $(my_copy_pairs)

$(my_built_custom_image): PRIVATE_PICKUP_FILES := $(my_pickup_files)

$(my_built_custom_image): PRIVATE_SELINUX := $(CUSTOM_IMAGE_SELINUX)

$(my_built_custom_image): PRIVATE_SUPPORT_VERITY := $(CUSTOM_IMAGE_SUPPORT_VERITY)

$(my_built_custom_image): PRIVATE_SUPPORT_VERITY_FEC := $(CUSTOM_IMAGE_SUPPORT_VERITY_FEC)

$(my_built_custom_image): PRIVATE_VERITY_KEY := $(PRODUCT_VERITY_SIGNING_KEY)

$(my_built_custom_image): PRIVATE_VERITY_BLOCK_DEVICE := $(CUSTOM_IMAGE_VERITY_BLOCK_DEVICE)

$(my_built_custom_image): PRIVATE_DICT_FILE := $(CUSTOM_IMAGE_DICT_FILE)
@@ -108,9 +106,6 @@ ifeq (true,$(filter true, $(CUSTOM_IMAGE_AVB_HASH_ENABLE) $(CUSTOM_IMAGE_AVB_HAS 
else ifneq (,$(filter true, $(CUSTOM_IMAGE_AVB_HASH_ENABLE) $(CUSTOM_IMAGE_AVB_HASHTREE_ENABLE)))

  $(error Cannot set both CUSTOM_IMAGE_AVB_HASH_ENABLE and CUSTOM_IMAGE_AVB_HASHTREE_ENABLE to true)

endif

ifeq (true,$(CUSTOM_IMAGE_SUPPORT_VERITY_FEC))

  $(my_built_custom_image): $(FEC)

endif

$(my_built_custom_image): $(INTERNAL_USERIMAGES_DEPS) $(my_built_modules) $(my_image_copy_files) $(my_custom_image_modules_dep) \

  $(CUSTOM_IMAGE_DICT_FILE)

	@echo "Build image $@"
@@ -130,13 +125,6 @@ $(my_built_custom_image): $(INTERNAL_USERIMAGES_DEPS) $(my_built_modules) $(my_i 
	$(hide) echo "partition_size=$(PRIVATE_PARTITION_SIZE)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt

	$(hide) echo "ext_mkuserimg=$(notdir $(MKEXTUSERIMG))" >> $(PRIVATE_INTERMEDIATES)/image_info.txt

	$(if $(PRIVATE_SELINUX),$(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt)

	$(if $(PRIVATE_SUPPORT_VERITY),\

	  $(hide) echo "verity=$(PRIVATE_SUPPORT_VERITY)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt;\

	    echo "verity_key=$(PRIVATE_VERITY_KEY)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt;\

	    echo "verity_signer_cmd=$(VERITY_SIGNER)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt;\

	    echo "verity_block_device=$(PRIVATE_VERITY_BLOCK_DEVICE)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt)

	$(if $(PRIVATE_SUPPORT_VERITY_FEC),\

	  $(hide) echo "verity_fec=$(PRIVATE_SUPPORT_VERITY_FEC)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt)

	$(if $(filter eng, $(TARGET_BUILD_VARIANT)),$(hide) echo "verity_disable=true" >> $(PRIVATE_INTERMEDIATES)/image_info.txt)

	$(hide) echo "avb_avbtool=$(PRIVATE_AVB_AVBTOOL)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt

	$(if $(PRIVATE_AVB_KEY_PATH),\