commit f4ea23b417992e84e6edbb12de34f615d2763308
author Matthew Maurer <mmaurer@google.com> Fri Apr 05 05:15:11 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 05 05:15:11 2019 +0000
tree 9c6b10ce4a7089af18be8b18e5cf0fd873afc6df
parent 6a43524d9115eb92841c75748e8ceac1d5ab5a90
parent 8539f0b632bbc454381004d0146417da15d701e5

Merge "Enable Trusty Gatekeeper@1.0"

trusty/trusty-base.mk

diff --git a/trusty/trusty-base.mk b/trusty/trusty-base.mk
index 0a0ecec..00e3dbc 100644
--- a/trusty/trusty-base.mk
+++ b/trusty/trusty-base.mk
@@ -19,8 +19,13 @@
 # to pull in the baseline set of Trusty specific modules.
 #
 
+# For gatekeeper, we include the generic -service and -impl to use legacy
+# HAL loading of gatekeeper.trusty.
+
 PRODUCT_PACKAGES += \
 	android.hardware.keymaster@3.0-service.trusty \
+	android.hardware.gatekeeper@1.0-service \
+	android.hardware.gatekeeper@1.0-impl \
 	gatekeeper.trusty
 
 PRODUCT_PROPERTY_OVERRIDES += \