commit b60c004cddb83c7997acefc8ec306311e0be9127
author Janis Danisevskis <jdanis@google.com> Thu Dec 17 00:11:21 2020 -0800
committer Janis Danisevskis <jdanis@google.com> Tue Jan 12 08:41:39 2021 -0800
tree 26845b16169af0aa10a532801c7e2c34b77e815d
parent de386b492ad0427a84bfc7e3e86b5faca16eb04a

Keystore 2.0: Make compatiblity wrapper use union KeyParameters.

Test: N/A
Change-Id: I411d90a71c5722281f13c28d55961d571f2eec90

keystore2/src/km_compat/Android.bp

diff --git a/keystore2/src/km_compat/Android.bp b/keystore2/src/km_compat/Android.bp
index 01cf2cc..7ca6a63 100644
--- a/keystore2/src/km_compat/Android.bp
+++ b/keystore2/src/km_compat/Android.bp
@@ -56,6 +56,7 @@
         "libcrypto",
         "libhidlbase",
         "libkeymaster4_1support",
+        "libkeymint_support",
         "libkeystore2_crypto",
         "libutils",
     ],
@@ -75,6 +76,7 @@
 }
 
 cc_test {
+    name: "keystore2_km_compat_test_cpp",
     cflags: [
         "-Wall",
         "-Werror",
@@ -83,6 +85,7 @@
     srcs: [
         "certificate_test.cpp",
         "gtest_main.cpp",
+        "parameter_conversion_test.cpp",
         "slot_test.cpp",
     ],
     shared_libs: [
@@ -97,9 +100,9 @@
         "libcrypto",
         "libhidlbase",
         "libkeymaster4_1support",
+        "libkeymint_support",
         "libkeystore2_crypto",
         "libkm_compat",
         "libutils",
     ],
-    name: "keystore2_certificate_test",
 }