From 91d8fcccea41b082d67a4c7819aa96872c9efad4 Mon Sep 17 00:00:00 2001
From: Shikha Panwar <shikhapanwar@google.com>
Date: Mon, 8 Jul 2024 10:03:59 +0000
Subject: [PATCH] Zuma: Disable Secretkeeper HAL for aosp build

The AOSP builds do not have a compatible BL for Secretkeeper (24Q3+).
This leads the crashing of HAL since the backing trusty is not updated
with the TA.

Test: lunch aosp & non-aosp targets -> get_build_var SECRETKEEPER_ENABLED
Bug: 350482613
Change-Id: I49d30914bc7a4b2b752a6d9eb7db0e7959638d98
---
 device.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/device.mk b/device.mk
index 3d6ea96c..2ad01444 100644
--- a/device.mk
+++ b/device.mk
@@ -92,6 +92,11 @@ TRUSTY_KEYMINT_IMPL := rust
 ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
 	# Set the environment variable to enable the Secretkeeper HAL service.
 	SECRETKEEPER_ENABLED := true
+	# TODO(b/341708664): Enable Secretkeeper unconditionally once AOSP targets are built with
+	# compatible bootloader (24Q3+).
+	ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
+		SECRETKEEPER_ENABLED := false
+	endif
 endif
 
 # OEM Unlock reporting