commit 2a77df8a86600a126fb5a187b0b50f126c139744
author Alan Stokes <alanstokes@google.com> Tue Jun 22 08:26:52 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 22 08:26:52 2021 +0000
tree c2fa9899663136c212bfdfa9daa1b78686cb3645
parent a337407937090028591df0b1941df40cbc171465
parent fd7eeeaa1db41ecd97e9f3cfd9157930d1f2d474

Merge "Allow CompOS APEX to access Keystore AIDL." am: fd7eeeaa1d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1741123

Change-Id: I0ecca542c584fa1278dea7e40b6b7b1ab37cd2ee

security/keymint/aidl/Android.bp

diff --git a/security/keymint/aidl/Android.bp b/security/keymint/aidl/Android.bp
index 0c11f3b..3796847 100644
--- a/security/keymint/aidl/Android.bp
+++ b/security/keymint/aidl/Android.bp
@@ -30,6 +30,10 @@
         },
         rust: {
             enabled: true,
+            apex_available: [
+                "//apex_available:platform",
+                "com.android.compos",
+            ],
         },
     },
 }

security/secureclock/aidl/Android.bp

diff --git a/security/secureclock/aidl/Android.bp b/security/secureclock/aidl/Android.bp
index c78be3b..6a2b753 100644
--- a/security/secureclock/aidl/Android.bp
+++ b/security/secureclock/aidl/Android.bp
@@ -26,6 +26,10 @@
         },
         rust: {
             enabled: true,
+            apex_available: [
+                "//apex_available:platform",
+                "com.android.compos",
+            ],
         },
     },
 }