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: I7350f0ca943b15a6f3e40023a6cc299bdf8aed0e
This commit is contained in:
Logan Chien
2018-02-14 13:53:04 +08:00
parent 145ecabda2
commit 404eb2bcd5
11 changed files with 2 additions and 286 deletions

View File

@@ -7,33 +7,3 @@ filegroup {
name: "IDropBoxManagerService.aidl",
srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"],
}
// only used by key_store_service
cc_library_shared {
name: "libkeystore_aidl",
srcs: ["android/security/IKeystoreService.aidl",
"android/security/IConfirmationPromptCallback.aidl"],
aidl: {
export_aidl_headers: true,
include_dirs: [
"frameworks/base/core/java/",
"system/security/keystore/",
],
},
shared_libs: [
"libbinder",
"libcutils",
"libhardware",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libkeystore_parcelables",
"libselinux",
"libutils",
],
export_shared_lib_headers: [
"libbinder",
"libkeystore_parcelables",
],
}