From 01478ec1839e89e72c7367f678171a9afa53d5db Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Mon, 23 Oct 2017 16:04:31 -0600
Subject: [PATCH] Export AIDL for keystore Android.bp.

Test: builds, boots
Bug: 67041047
Change-Id: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1
Merged-In: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1
(cherry picked from commit 0c686e78ad2fbfc9e814bdd3abc5bd66c858c60f)
---
 Android.bp           | 2 +-
 core/java/Android.bp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 core/java/Android.bp

diff --git a/Android.bp b/Android.bp
index b28567af0b778..b9f000b2efb23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -68,7 +68,7 @@ cc_library {
 
 subdirs = [
     "cmds/*",
-    "core/jni",
+    "core/*",
     "libs/*",
     "media/*",
     "tools/*",
diff --git a/core/java/Android.bp b/core/java/Android.bp
new file mode 100644
index 0000000000000..42b0f6bad0aec
--- /dev/null
+++ b/core/java/Android.bp
@@ -0,0 +1,4 @@
+filegroup {
+    name: "IKeyAttestationApplicationIdProvider.aidl",
+    srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],
+}