commit b2a23216f0cd8b45af13b36d855b2a484c32cdda
author Alan Stokes <alanstokes@google.com> Tue Jun 22 10:09:13 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 22 10:09:13 2021 +0000
tree 5f365815a7366fb1b8132e1270fd13aceee696f9
parent 7af48321ce8f21627dc28e75f9b55dda48c9d263
parent 631063a5be7631a2ff4f6e85225b71b833156063

Merge "Allow CompOS APEX to access Keystore AIDL." am: fd7eeeaa1d am: 2a77df8a86 am: adb7159de8 am: 631063a5be

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

Change-Id: I17551fdbe27670259f4a9c2947b4bffda687df9d

security/keymint/aidl/Android.bp

diff --git a/security/keymint/aidl/Android.bp b/security/keymint/aidl/Android.bp
index 694ce6a..cd45a62 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",
+            ],
         },
     },
     versions: ["1"],

security/secureclock/aidl/Android.bp

diff --git a/security/secureclock/aidl/Android.bp b/security/secureclock/aidl/Android.bp
index b70dda9..5235dd5 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",
+            ],
         },
     },
     versions: ["1"],