From 58aa4310694a770ed08ec069e6128da01628eb2b Mon Sep 17 00:00:00 2001
From: Max Bires <jbires@google.com>
Date: Fri, 6 Aug 2021 05:55:15 -0700
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index ff6460de8..cf056f091 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -120,6 +120,7 @@ cc_binary {
     ],
     required: [
         "android.hardware.hardware_keystore.xml",
+        "RemoteProvisioner",
     ],
 }