commit 58aa4310694a770ed08ec069e6128da01628eb2b
author Max Bires <jbires@google.com> Fri Aug 06 05:55:15 2021 -0700
committer Max Bires <jbires@google.com> Fri Aug 06 05:58:24 2021 -0700
tree 4ea653d328389f052fb1557fdddab1f95879270b
parent 830ea32e77292d4584977ac8162dcdbc92de613a

Make RemoteProvisioner required for KeyMint cc_bin

This change adds the RPK apk back into the image for Trusty Keymint
devices, though the functionality will still be disabled by the
server check-in for now.

Ignore-AOSP-First: Will be CP'ed to AOSP
Bug: 194509629
Test: atest RemoteProvisionerUnitTests
Change-Id: Ic20ca119bd9c0614f7559b24ad60718c813a0cca

trusty/keymaster/Android.bp

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",
     ],
 }