diff --git a/Android.bp b/Android.bp
index 2dc1cc3..13f6b6e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -72,7 +72,7 @@
 
 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 0000000..42b0f6b
--- /dev/null
+++ b/core/java/Android.bp
@@ -0,0 +1,4 @@
+filegroup {
+    name: "IKeyAttestationApplicationIdProvider.aidl",
+    srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],
+}