tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
David Drysdale 2024-01-31 08:00:03 +00:00 committed by Automerger Merge Worker
commit 6c2cb28318
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trusty/trusty-base.mk
View file

@ -36,10 +36,10 @@ else
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 += \