From 76de5fed8dbf841c9c04abed461dce17c985568e Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Tue, 16 Apr 2024 12:56:12 +0100 Subject: [PATCH] Reapply "Enable Secretkeeper HAL service on gs201" (This reverts commit 9922a0fc1260, ag/26704327.) This requires that prebuilts on `main` have been updated to include the April updates to the Secretkeeper TA (which includes fixes needed to cope with larger and more realistic DICE chains). Relevant devices: - pantah - felix - lynx - tangorpro Bug: 291228655 Bug: 306364873 Bug: 341708664 Test: VtsSecretkeeperTargetTest on cheetah Flag: build.RELEASE_AVF_ENABLE_LLPVM_CHANGES Change-Id: I251a14221915fa8b2aaf3f1611c8c9f698596552 --- device.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 8508d894..38add23a 100644 --- a/device.mk +++ b/device.mk @@ -83,6 +83,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 @@ -256,7 +261,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