commit 700ff706f1fcd8a46194d924854859c13b3ddf2d
author David Drysdale <drysdale@google.com> Wed Jan 31 07:13:24 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 31 07:13:24 2024 +0000
tree b75c0b85b59eea7979c30df09a63c2c51e1fee8d
parent 0edd5b860a771057bf532176d91a4398a394bdef
parent 073133811e800075f7fe7e53d118cbe09939b60d

Merge "Secretkeeper: require SECRETKEEPER_ENABLED=true" into main

trusty/trusty-base.mk

diff --git a/trusty/trusty-base.mk b/trusty/trusty-base.mk
index d645c3e..5aa4392 100644
--- a/trusty/trusty-base.mk
+++ b/trusty/trusty-base.mk
@@ -36,10 +36,10 @@
 endif
 
 # TODO(b/306364873): move this to be flag-controlled?
-ifeq ($(SECRETKEEPER_ENABLED),)
-    LOCAL_SECRETKEEPER_PRODUCT_PACKAGE :=
-else
+ifeq ($(SECRETKEEPER_ENABLED),true)
     LOCAL_SECRETKEEPER_PRODUCT_PACKAGE := android.hardware.security.secretkeeper.trusty
+else
+    LOCAL_SECRETKEEPER_PRODUCT_PACKAGE :=
 endif
 
 PRODUCT_PACKAGES += \