| commit | ab96ce997a88946a95a62f79ccd8af74fa43d787 | [log] [tgz] |
|---|---|---|
| author | Max Bires <jbires@google.com> | Sun Aug 15 18:27:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 18:27:05 2021 +0000 |
| tree | aa1e5a22334d7d843216d2979bc25c2ea94b59f6 | |
| parent | ba6fff6d8aa15c9ad3bd85ace7d54ebce4325e7d [diff] | |
| parent | a19f6e39405ac7e90db633367e6d9db61ac58865 [diff] |
Merge "Make RemoteProvisioner required for KeyMint cc_bin" into sc-dev am: 98f87ca8a7 am: a19f6e3940 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15481660 Change-Id: I6cee24f3f1bc7d5ad7c41d726d2a505b9ef5bd13
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp index ff6460d..cf056f0 100644 --- a/trusty/keymaster/Android.bp +++ b/trusty/keymaster/Android.bp
@@ -120,6 +120,7 @@ ], required: [ "android.hardware.hardware_keystore.xml", + "RemoteProvisioner", ], }