commit 6c2cb28318e9ee336a656dd8fafeb4055da1c8b9
author David Drysdale <drysdale@google.com> Wed Jan 31 08:00:03 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 31 08:00:03 2024 +0000
tree 77446b08bdcdb69c6a27f479e9c0ba314bae5408
parent ac6907b466a0dcf446511242603b0ff2f3e985b6
parent 700ff706f1fcd8a46194d924854859c13b3ddf2d

Merge "Secretkeeper: require SECRETKEEPER_ENABLED=true" into main am: 700ff706f1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2937199

Change-Id: I45d94c65b841765ad81ad34c1ac687441c2c25e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 += \