Merge "Explicitly install RemoteProvisioner for keymint"

2022-09-23 00:46:20 +00:00 · 2022-09-23 00:46:20 +00:00 · 173bc15585
commit 173bc15585
parent f2bbe1d91a ed673496c2
2 changed files with 2 additions and 2 deletions
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@ -123,7 +123,6 @@ cc_binary {
    ],
    required: [
        "android.hardware.hardware_keystore.xml",
-        "RemoteProvisioner",
    ],
 }

--- a/trusty/trusty-base.mk
+++ b/trusty/trusty-base.mk
@ -25,7 +25,8 @@
 PRODUCT_PACKAGES += \
 	android.hardware.security.keymint-service.trusty \
 	android.hardware.gatekeeper@1.0-service.trusty \
-	trusty_apploader
+	trusty_apploader \
+	RemoteProvisioner

 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.hardware.keystore_desede=true \