commit a447b3c9af62540abcc2d01a4d62124838ffe89d
author Dmitry Dementyev <dementyev@google.com> Fri Oct 27 23:09:53 2017 -0700
committer Dmitry Dementyev <dementyev@google.com> Thu Nov 16 18:35:51 2017 -0800
tree 985c942242f35e3e105b744a063a276f98063056
parent 1cb37a76815f2f1b1371d466f9c9b4b51163a777

Get rid of manually created IKeystoreService.

Generated IKeystoreService has different signature, which required lots
of refactoring.
After update methods relevant data using last parameter.
Test: cts-tradefed run cts -m CtsKeystoreTestCases
Bug: 68389643

Change-Id: I0ca36a2e9e007143a3b403b306a8f979ee98b232

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index 35ffcdb..886706a 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -115,9 +115,12 @@
     defaults: ["keystore_defaults"],
 
     srcs: [
-        "IKeystoreService.cpp",
+        ":IKeystoreService.aidl",
         "KeyAttestationApplicationId.cpp",
         "KeyAttestationPackageInfo.cpp",
+        "KeymasterArguments.cpp",
+        "KeystoreArguments.cpp",
+        "OperationResult.cpp",
         "Signature.cpp",
         "authorization_set.cpp",
         "keyblob_utils.cpp",
@@ -141,6 +144,10 @@
         type: "lite",
         export_proto_headers: true,
     },
+    aidl: {
+        export_aidl_headers: true,
+        include_dirs: ["frameworks/base/core/java/"],
+    },
     export_include_dirs: ["include"],
     export_shared_lib_headers: [
         "android.hardware.keymaster@3.0",