ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Allow selection of Trusty KeyMint HAL implementation" am: bf6ac3534e

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

Change-Id: Ie2456dbe49290ce4b32baa6b9100adb4a7747775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Drysdale 2023-01-05 07:02:56 +00:00 • committed by Automerger Merge Worker
commit d7fb5e8d16
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
trusty/trusty-base.mk
View file

@ -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