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

Commit e3ca398a authored by hungweichen's avatar hungweichen
Browse files

Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY 

verity.mk is used to set the related variable for VB 1.0 support, but
we already removed VB 1.0. This change removes the unused code. We also
remove and block PRODUCT_VERITY_SIGNING_KEY in this change.

Bug: 241044073
Test: atest under build/make
Change-Id: Ifbcde7da27a931ef3b9d746b1c5a279d88c0ec85
parent bf11e348

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ $(KATI_obsolete_var ALL_ORIGINAL_DYNAMIC_BINARIES,ALL_ORIGINAL_DYNAMIC_BINARIES 
$(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)

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

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

.PHONY: FORCE

FORCE:

core/product.mk

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ _product_list_vars += PRODUCT_DEXPREOPT_SPEED_APPS 
_product_list_vars += PRODUCT_LOADED_BY_PRIVILEGED_MODULES

_product_single_value_vars += PRODUCT_VBOOT_SIGNING_KEY

_product_single_value_vars += PRODUCT_VBOOT_SIGNING_SUBKEY

_product_single_value_vars += PRODUCT_VERITY_SIGNING_KEY

_product_single_value_vars += PRODUCT_SYSTEM_VERITY_PARTITION

_product_single_value_vars += PRODUCT_VENDOR_VERITY_PARTITION

_product_single_value_vars += PRODUCT_PRODUCT_VERITY_PARTITION

core/tasks/tools/build_custom_image.mk

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +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_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)

$(my_built_custom_image): PRIVATE_AVB_AVBTOOL := $(AVBTOOL)

target/product/security/Android.mk

+0 −37
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



#######################################

# verity_key (installed to /, i.e. part of system.img)

include $(CLEAR_VARS)



LOCAL_MODULE := verity_key

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)



# For devices using a separate ramdisk, we need a copy there to establish the chain of trust.

ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

LOCAL_REQUIRED_MODULES := verity_key_ramdisk

endif



include $(BUILD_PREBUILT)



#######################################

# verity_key (installed to ramdisk)

#

# Enabling the target when using system-as-root would cause build failure, as TARGET_RAMDISK_OUT

# points to the same location as TARGET_ROOT_OUT.

ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

  include $(CLEAR_VARS)

  LOCAL_MODULE := verity_key_ramdisk

  LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

  LOCAL_LICENSE_CONDITIONS := notice

  LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE

  LOCAL_MODULE_CLASS := ETC

  LOCAL_SRC_FILES := verity_key

  LOCAL_MODULE_STEM := verity_key

  LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)

  include $(BUILD_PREBUILT)

endif



#######################################

# adb key, if configured via PRODUCT_ADB_KEYS

ifdef PRODUCT_ADB_KEYS

target/product/security/verity.pk8

deleted100644 → 0
−1.19 KiB

File deleted.

View file