OSDN Git Service

Fix PDK build
authorLogan Chien <loganchien@google.com>
Wed, 14 Feb 2018 05:53:04 +0000 (13:53 +0800)
committerLogan Chien <loganchien@google.com>
Wed, 14 Feb 2018 07:46:50 +0000 (15:46 +0800)
commit404eb2bcd5276eda9b1a5de3bc535aca114b6d51
tree0d46dc30ab44af2b4386383fe7829f8fc8f59c82
parent145ecabda275e42c9176446240de4fed5c89b71b
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
Android.bp
core/java/Android.bp
core/java/android/security/IConfirmationPromptCallback.aidl [deleted file]
core/java/android/security/IKeystoreService.aidl [deleted file]
core/java/android/security/KeystoreArguments.aidl [deleted file]
core/java/android/security/keymaster/ExportResult.aidl [deleted file]
core/java/android/security/keymaster/KeyCharacteristics.aidl [deleted file]
core/java/android/security/keymaster/KeymasterArguments.aidl [deleted file]
core/java/android/security/keymaster/KeymasterBlob.aidl [deleted file]
core/java/android/security/keymaster/KeymasterCertificateChain.aidl [deleted file]
core/java/android/security/keymaster/OperationResult.aidl [deleted file]