commit 173bc15585f788b540bd8fa487cdaf351dac2f39
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 23 00:46:20 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 23 00:46:20 2022 +0000
tree 03caf9a6afad1bb71b0e195fdf59c569762ae459
parent f2bbe1d91a9b884997a10302858ed31ae3f22d8a
parent ed673496c2eabdd772ea4bedfc299f26040070cb

Merge "Explicitly install RemoteProvisioner for keymint"

trusty/keymaster/Android.bp

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 0e916ef..adc9fdf 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -123,7 +123,6 @@
     ],
     required: [
         "android.hardware.hardware_keystore.xml",
-        "RemoteProvisioner",
     ],
 }
 

trusty/trusty-base.mk

diff --git a/trusty/trusty-base.mk b/trusty/trusty-base.mk
index d40a59e..0609709 100644
--- 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 \