| commit | fd94a45275abe27a9ea8b1b154602af00552d4a9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 23 04:06:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 23 04:06:07 2022 +0000 |
| tree | 03caf9a6afad1bb71b0e195fdf59c569762ae459 | |
| parent | 2834c0b608985ea6e2bac6efab66ccc4f1f623dd [diff] | |
| parent | 5e00ad631c7108873ccc56c67b97351dae7eac08 [diff] |
Merge "Explicitly install RemoteProvisioner for keymint" am: 173bc15585 am: b946199762 am: a7070f997a am: 5e00ad631c Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219544 Change-Id: If1a2a283a5b0c7bcb0f65b47fe0c3ace7e5a856d 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 \