commit 3f7c80ac05bd93609f4ecb9e8f3229ce5b6b1117
author Shawn Willden <swillden@google.com> Wed Jan 15 19:09:50 2020 -0700
committer Shawn Willden <swillden@google.com> Tue Feb 11 15:51:03 2020 -0700
tree 623826dca8870bc3502d28c7b61952f5ae900a5b
parent 390825b29146ea1129a8ca8e7b07d76269a3cc80

Keymaster 4.1 VTS tests

Bug: 140193672
Bug: 140192237
Test:  VtsHalKeymasterV4_1TargetTest
Change-Id: I488402079ebb3940e021ac1558aeee15c4b133c9
Merged-In: I488402079ebb3940e021ac1558aeee15c4b133c9

keymaster/4.0/vts/functional/Android.bp

diff --git a/keymaster/4.0/vts/functional/Android.bp b/keymaster/4.0/vts/functional/Android.bp
index 7244ae3..db50080 100644
--- a/keymaster/4.0/vts/functional/Android.bp
+++ b/keymaster/4.0/vts/functional/Android.bp
@@ -19,7 +19,6 @@
     defaults: ["VtsHalTargetTestDefaults"],
     srcs: [
         "HmacKeySharingTest.cpp",
-        "KeymasterHidlTest.cpp",
         "VerificationTokenTest.cpp",
         "keymaster_hidl_hal_test.cpp",
     ],
@@ -27,9 +26,25 @@
         "android.hardware.keymaster@4.0",
         "libcrypto_static",
         "libkeymaster4support",
+        "libkeymaster4vtstest",
     ],
     test_suites: [
         "general-tests",
         "vts-core",
     ],
 }
+
+cc_test_library {
+    name: "libkeymaster4vtstest",
+    defaults: ["VtsHalTargetTestDefaults"],
+    srcs: [
+        "KeymasterHidlTest.cpp",
+    ],
+    export_include_dirs: [
+        ".",
+    ],
+    static_libs: [
+        "android.hardware.keymaster@4.0",
+        "libkeymaster4support",
+    ],
+}