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

Commit bf5922e5 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Allow selection of Trusty KeyMint HAL implementation" am: bf6ac353 am: d7fb5e8d 

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



Change-Id: I872b7dd045394a1d7ceafba26beb8a1bf9fc8a01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 388345f6 d7fb5e8d

trusty/trusty-base.mk

+14 −1
Original line number Diff line number Diff line
@@ -22,8 +22,21 @@ 
# For gatekeeper, we include the generic -service and -impl to use legacy

# HAL loading of gatekeeper.trusty.



# Allow the KeyMint HAL service implementation to be selected at build time.  This needs to be

# done in sync with the TA implementation included in Trusty.  Possible values are:

#

# - Rust implementation:   export TRUSTY_KEYMINT_IMPL=rust

# - C++ implementation:    (any other value of TRUSTY_KEYMINT_IMPL)



ifeq ($(TRUSTY_KEYMINT_IMPL),rust)

    LOCAL_KEYMINT_PRODUCT_PACKAGE := android.hardware.security.keymint-service.rust.trusty

else

    # Default to the C++ implementation

    LOCAL_KEYMINT_PRODUCT_PACKAGE := android.hardware.security.keymint-service.trusty

endif



PRODUCT_PACKAGES += \

	android.hardware.security.keymint-service.trusty \

	$(LOCAL_KEYMINT_PRODUCT_PACKAGE) \

	android.hardware.gatekeeper@1.0-service.trusty \

	trusty_apploader \

	RemoteProvisioner