Fix PDK build
This commit moves "IConfirmationPromptCallback.aidl" and
"IKeystoreService.aidl" to "system/security/keystore/binder" so that
"libkeystore_aidl" can be built in PDK builds.
Test: Run `cts-tradefed run cts -m CtsKeystoreTestCases` on Pixel 2017
and the test results are idential with and without this CL.
Test: Build PDK with special manifest described in
http://b/69539820#comment18 and http://b/69539820#comment19.
Test: Build a target (described in http://b/72961456) with
`platform.zip` built from master FSK source tree.
Bug: 69539820
Bug: 72961456
Change-Id: Ia0979568835efaf24508b0fac97357c85fd3f44c
diff --git a/keystore/Android.bp b/keystore/Android.bp
index cb736b3..9e882e4 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -246,4 +246,39 @@
export_include_dirs: ["include"],
}
+filegroup {
+ name: "keystore_aidl",
+ srcs: [
+ "binder/android/security/IConfirmationPromptCallback.aidl",
+ "binder/android/security/IKeystoreService.aidl",
+ ],
+}
+
+cc_library_shared {
+ name: "libkeystore_aidl",
+ srcs: [":keystore_aidl"],
+ aidl: {
+ export_aidl_headers: true,
+ include_dirs: [
+ "system/security/keystore/binder",
+ ],
+ },
+ shared_libs: [
+ "libbinder",
+ "libcutils",
+ "libhardware",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libkeystore_parcelables",
+ "liblog",
+ "libselinux",
+ "libutils",
+ ],
+ export_shared_lib_headers: [
+ "libbinder",
+ "libkeystore_parcelables",
+ ],
+}
+
subdirs = ["tests"]