From 72946bd429d46ae7b532ea12f93e39d503f3010b Mon Sep 17 00:00:00 2001
From: Shikha Panwar <shikhapanwar@google.com>
Date: Mon, 30 Sep 2024 12:13:56 +0000
Subject: [PATCH] Zuma: Enable Secretkeeper on aosp targets

These are used for testing, enable Secretkeeper on these devices.

Test: get_build_var SECRETKEEPER_ENABLED
Bug: 341708664
Change-Id: I0fd0e3d5a16cab352c79228e89f9d2fdd6f886b7
---
 device.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/device.mk b/device.mk
index cd4f0f35..9d368c54 100644
--- a/device.mk
+++ b/device.mk
@@ -95,11 +95,6 @@ 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