commit 19fe29adb35c301d7bcbb6964a70b3e5f926c1b2
author Rajesh Nyamagoud <nyamagoud@google.com> Wed Oct 04 18:36:55 2023 +0000
committer Rajesh Nyamagoud <nyamagoud@google.com> Fri Oct 06 23:15:21 2023 +0000
tree a1d3b968cc21e938e39295589f435f17a4fe06a2
parent 1a7cd1d195a635b96c83e78114837d81ce923512

Removed dependency on `libkeymint_vts_test_utils`.

Test: mmm system/security/keystore2/test_utils/; mmm system/security/keystore2/tests;
atest keystore2_client_tests; atest keystore2_test_utils_test; atest keystore2_test; atest keystore2_legacy_blobs_test;
Bug: 194359114

Change-Id: I2e17697c8ea54b1c38e128b32b4d30f1214c51fc

keystore2/test_utils/Android.bp

diff --git a/keystore2/test_utils/Android.bp b/keystore2/test_utils/Android.bp
index b2360db..9f3a4e9 100644
--- a/keystore2/test_utils/Android.bp
+++ b/keystore2/test_utils/Android.bp
@@ -43,11 +43,10 @@
         "libkeystore2_ffi_test_utils",
     ],
     shared_libs: [
+        "libbase",
         "libcrypto",
-        "libkeymaster_messages",
         "libkeymaster_portable",
         "libkeymint_support",
-        "libkeymint_vts_test_utils",
         "libkeystore-engine",
     ],
 }
@@ -73,8 +72,7 @@
     name: "libkeystore2_ffi_test_utils",
     srcs: ["ffi_test_utils.cpp"],
     defaults: [
-        "keymint_vts_defaults",
-        "hidl_defaults",
+        "keymint_use_latest_hal_aidl_ndk_shared",
     ],
     generated_headers: [
         "cxx-bridge-header",
@@ -82,11 +80,12 @@
     ],
     generated_sources: ["libkeystore2_ffi_test_utils_bridge_code"],
     shared_libs: [
+        "libbase",
+        "libcrypto",
         "libcppbor_external",
-        "libkeymaster_messages",
         "libkeymaster_portable",
         "libkeystore-engine",
-        "libkeymint_vts_test_utils",
+        "libkeymint_support",
     ],
 }