commit b321b410ff2a5a9937e0205a178016d09ecb109f
author Matthew Maurer <mmaurer@google.com> Mon Mar 18 13:59:28 2019 -0700
committer Matthew Maurer <mmaurer@google.com> Thu May 16 14:19:50 2019 -0700
tree 351a57cef7565fceb75280fdbd0805fee0b9f9e8
parent cc30f4d7dd2de0cd1213703ed0d3165b4671ebef

Trusty Keymaster@4.0

Adds support for proxying V4.0 commands to Trusty and makes 4.0 the
default when including trusty-base.mk.

Bug: 128851722
Test: Keymaster VTS 4.0 + Trusty
Change-Id: I2e2220963996fcb88d6953ee1a58af1b947b857d

trusty/trusty-base.mk

diff --git a/trusty/trusty-base.mk b/trusty/trusty-base.mk
index 00e3dbc..445d3ce 100644
--- a/trusty/trusty-base.mk
+++ b/trusty/trusty-base.mk
@@ -23,7 +23,7 @@
 # HAL loading of gatekeeper.trusty.
 
 PRODUCT_PACKAGES += \
-	android.hardware.keymaster@3.0-service.trusty \
+	android.hardware.keymaster@4.0-service.trusty \
 	android.hardware.gatekeeper@1.0-service \
 	android.hardware.gatekeeper@1.0-impl \
 	gatekeeper.trusty