commit a97aea4040459cca3c5e2f6f81853ba876a886da
author Shawn Willden <swillden@google.com> Thu Jan 16 13:27:49 2020 -0700
committer Shawn Willden <swillden@google.com> Tue Feb 11 15:51:04 2020 -0700
tree 44cae135ef13bd19efd1e4a1bcc7c2e0ac81c88f
parent fc1fc88195ae8771d6a78b0e7d4ec9fbda339dd7

Update keystore to use KM4.1.

This is the first part of the update, adjusting keystore to use the
KM4.1 interface, but not call any of the new methods.  That will come
in a subsequent CL.

Test: CtsKeystoreTestCases
Change-Id: Ib7486aad46c144471a1607eec31b8df1059a511d
Merged-In: Ib7486aad46c144471a1607eec31b8df1059a511d

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index c0aeeda..6145047 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -53,6 +53,7 @@
         "android.hardware.confirmationui@1.0",
         "android.hardware.keymaster@3.0",
         "android.hardware.keymaster@4.0",
+        "android.hardware.keymaster@4.1",
         "libbase",
         "libbinder",
         "libcrypto",
@@ -60,6 +61,7 @@
         "libhardware",
         "libhidlbase",
         "libkeymaster4support",
+        "libkeymaster4_1support",
         "libkeymaster_messages",
         "libkeymaster_portable",
         "libkeystore-attestation-application-id",
@@ -150,10 +152,12 @@
     ],
     shared_libs: [
         "android.hardware.keymaster@4.0",
+        "android.hardware.keymaster@4.1",
         "libbinder",
         "libhardware",
         "libhidlbase",
         "libkeymaster4support",
+        "libkeymaster4_1support",
         "liblog",
         "libprotobuf-cpp-lite",
         "libutils",
@@ -161,9 +165,10 @@
     ],
     export_shared_lib_headers: [
         "android.hardware.keymaster@4.0",
+        "android.hardware.keymaster@4.1",
         "libbinder",
         "libhidlbase",
-        "libkeymaster4support",
+        "libkeymaster4_1support",
     ],
 }
 // Library for keystore clients