From 5375e70d9681c82c5cc090627bcfa63f9d23f19c Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Tue, 20 Feb 2024 14:37:30 +0000
Subject: [PATCH] Enable Secretkeeper HAL service on zuma

The prebuilts on `main` for zuma devices have been updated to include:
- the Secretkeeper TA in Trusty
- the ABL changes to retrieve the Secretkeeper identity pub key.

So enable the corresponding HAL service for Secretkeeper when the
relevant build flag is enabled.

Bug: 291228655
Bug: 306364873
Test: VtsSecretkeeperTargetTest on shiba
Change-Id: Ida12d0742c1e74e15e0f5606ab19cdb90afbcb2b
---
 device.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index e3818ced..2213ebc1 100644
--- a/device.mk
+++ b/device.mk
@@ -89,6 +89,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
 # Set the environment variable to switch the Keymint HAL service to Rust
 TRUSTY_KEYMINT_IMPL := rust
 
+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
@@ -833,7 +838,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/trusty/common
 
 PRODUCT_PACKAGES += \
- 	trusty_metricsd
+	trusty_metricsd
 
 $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma)
 PRODUCT_PACKAGES += \