From b0a8c9520b4f4b4e3dbfd7a5897e216c3ca07fc0 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Thu, 7 Mar 2019 17:03:29 -0800 Subject: [PATCH] Enable Trusty Gatekeeper@1.0 Previously we only installed the gatekeeper.trusty.so library, which is insufficient to actually start Gatekeeper. We now also install the -impl and -service wrappers. Bug: 127700127 Test: Gatekeeper 1.0 VTS with Trusty running Change-Id: Idd8d6a4e1e409c2a712dddfd92d5f9cf6b16b50c --- trusty/trusty-base.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/trusty/trusty-base.mk b/trusty/trusty-base.mk index 0a0ecec02..00e3dbc6a 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 += \