Merge "Explicitly install RemoteProvisioner for keymint" am: 173bc15585 am: b946199762

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219544

Change-Id: I17cf41e4c3483715c278f7d2d06e0e87dd8e6645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-09-23 02:55:14 +00:00 committed by Automerger Merge Worker
commit a7070f997a
2 changed files with 2 additions and 2 deletions

View file

@ -123,7 +123,6 @@ cc_binary {
],
required: [
"android.hardware.hardware_keystore.xml",
"RemoteProvisioner",
],
}

View file

@ -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 \