From 75b760799f5ae48f127ce62fd0ef39f7acd77e88 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 21 Nov 2017 20:20:36 -0800
Subject: Add static dependency between key_store_service and
 IKeyStoreService.aidl

Test: manual
Bug: 69539820
Change-Id: I1b65b0355635bf4bc8b16a7fba48d48a77e0ca46
---
 core/java/Android.bp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/core/java/Android.bp b/core/java/Android.bp
index 1503445a1b02..d8c79293f9ba 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -3,7 +3,26 @@ filegroup {
     srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],
 }
 
-filegroup {
-    name: "IKeystoreService.aidl",
+// only used by key_store_service
+cc_library_static {
+    name: "libkeystore_aidl",
     srcs: ["android/security/IKeystoreService.aidl"],
+    aidl: {
+        export_aidl_headers: true,
+        include_dirs: ["frameworks/base/core/java/"],
+    },
+    header_libs: [
+        "libkeystore_headers",
+    ],
+    shared_libs: [
+        "libbinder",
+        "libcutils",
+        "libhardware",
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libselinux",
+        "libutils",
+    ],
 }
-- 
cgit v1.2.3-59-g8ed1b