From a929e8bc02a747e418b3b5e890f3d892c4ed14cb Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Wed, 28 Feb 2024 14:42:39 +0000 Subject: [PATCH] Enable Secretkeeper HAL service on gs201 The prebuilts on `main` have been updated to include: - the Secretkeeper TA in Trusty (in ab/11346410) - the ABL changes to retrieve the Secretkeeper identity pub key. for the relevant devices: - pantah (http://ag/26396674 to Trusty ab/11498491) - felix (http://ag/26385511 to Trusty ab/11498491) - lynx (http://ag/26395689 to Trusty ab/11498491) - tangorpro (http://ag/26396492 to Trusty ab/11498491) So enable the corresponding HAL service for Secretkeeper when the relevant build flag is enabled. Bug: 291228655 Bug: 306364873 Test: VtsSecretkeeperTargetTest on cheetah Change-Id: I42804579ab4ff5a8ac0edd48fead8631f580dc37 --- device.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index f8f116b7..3cf89d31 100644 --- a/device.mk +++ b/device.mk @@ -82,6 +82,11 @@ PRODUCT_SOONG_NAMESPACES += \ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 +ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) + # Set the environment variable to enable the Secretkeeper HAL service. + SECRETKEEPER_ENABLED := true +endif + # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -249,7 +254,7 @@ PRODUCT_PACKAGES += \ PRODUCT_VENDOR_PROPERTIES += \ vendor.mali.platform.config=/vendor/etc/mali/platform.config \ vendor.mali.debug.config=/vendor/etc/mali/debug.config \ - vendor.mali.base_protected_max_core_count=1 \ + vendor.mali.base_protected_max_core_count=1 \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576