| commit | 25407dc226ceac84036b988e484fc318443ded47 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 23 04:35:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 23 04:35:25 2022 +0000 |
| tree | 2ca7f2fb6c948d7cd2ccd17a286e88203c09e74b | |
| parent | 2b96759e1cd30b0bb2d8765780a87772f28b7ed1 [diff] | |
| parent | fd94a45275abe27a9ea8b1b154602af00552d4a9 [diff] |
Merge "Explicitly install RemoteProvisioner for keymint" am: 173bc15585 am: b946199762 am: a7070f997a am: 5e00ad631c am: fd94a45275 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219544 Change-Id: Ibfb1e37a4952189995320d7fd89139f72202b9a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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", ], }
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 \