Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 700ff706 authored by David Drysdale's avatar David Drysdale Committed by Gerrit Code Review
Browse files

Merge "Secretkeeper: require SECRETKEEPER_ENABLED=true" into main

parents 0edd5b86 07313381

trusty/trusty-base.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -36,10 +36,10 @@ else 
endif

endif





# TODO(b/306364873): move this to be flag-controlled?

# TODO(b/306364873): move this to be flag-controlled?

ifeq ($(SECRETKEEPER_ENABLED),)

ifeq ($(SECRETKEEPER_ENABLED),true)

    LOCAL_SECRETKEEPER_PRODUCT_PACKAGE :=

else

    LOCAL_SECRETKEEPER_PRODUCT_PACKAGE := android.hardware.security.secretkeeper.trusty

    LOCAL_SECRETKEEPER_PRODUCT_PACKAGE := android.hardware.security.secretkeeper.trusty

else

    LOCAL_SECRETKEEPER_PRODUCT_PACKAGE :=

endif

endif





PRODUCT_PACKAGES += \

PRODUCT_PACKAGES += \