commit af2968c92200b1ff69467546840676e5d7380e29
author Dmitry Dementyev <dementyev@google.com> Tue Nov 21 20:19:03 2017 -0800
committer Dmitry Dementyev <dementyev@google.com> Wed Nov 22 05:30:01 2017 +0000
tree 44ea1ab66d4bec35b58e37308cf0f8bed6e5ff21
parent 4a182800b14326134f5c4e4ec2795f8686aff1f4

Add static dependency between key_store_service and IKeyStoreService.aidl

Test: manual
Bug: 69539820
Change-Id: Ie49cb6023213c1b91fb85d12b934b961c3703cc9

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index 886706a..7bc1c20 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -109,13 +109,31 @@
     local_include_dirs: ["include"],
 }
 
+cc_library_headers {
+    name: "libkeystore_headers",
+    export_include_dirs: ["include"],
+    shared_libs: [
+        "android.hardware.keymaster@3.0",
+        "libbinder",
+        "libhidlbase",
+        "libhwbinder",
+        "liblog",
+        "libprotobuf-cpp-lite",
+        "libutils",
+    ],
+    export_shared_lib_headers: [
+        "android.hardware.keymaster@3.0",
+        "libbinder",
+        "libhidlbase",
+        "libhwbinder",
+    ],
+}
 // Library for keystore clients
 cc_library_shared {
     name: "libkeystore_binder",
     defaults: ["keystore_defaults"],
 
     srcs: [
-        ":IKeystoreService.aidl",
         "KeyAttestationApplicationId.cpp",
         "KeyAttestationPackageInfo.cpp",
         "KeymasterArguments.cpp",
@@ -130,6 +148,7 @@
         "keystore_get.cpp",
         "keystore_tags_utils.cpp",
     ],
+    static_libs: ["libkeystore_aidl",],
     shared_libs: [
         "android.hardware.keymaster@3.0",
         "libbinder",
@@ -149,6 +168,9 @@
         include_dirs: ["frameworks/base/core/java/"],
     },
     export_include_dirs: ["include"],
+    export_static_lib_headers: [
+        "libkeystore_aidl",
+    ],
     export_shared_lib_headers: [
         "android.hardware.keymaster@3.0",
         "libbinder",