From 42276da8553cf934c54d14e900cf12dbbac66127 Mon Sep 17 00:00:00 2001
From: Rajesh Nyamagoud <nyamagoud@google.com>
Date: Fri, 1 Sep 2023 16:50:01 +0000
Subject: [PATCH] Updated to use shared library instead of static library.

Removed `libkeymint_vts_test_utils` and its dependent libs from static
libs list and added only `libkeymint_vts_test_utils` in shared libs
list.

Test: m libkeystore2_test_utils; atest keystore2_client_tests; atest keystore2_test_utils_test;
atest keystore2_test
Bug: 194359114

Change-Id: Iab4b8c174af81a8c64a9f44fcd634d54f78773da
---
 keystore2/test_utils/Android.bp | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/keystore2/test_utils/Android.bp b/keystore2/test_utils/Android.bp
index eb04209a..b2360dbd 100644
--- a/keystore2/test_utils/Android.bp
+++ b/keystore2/test_utils/Android.bp
@@ -40,28 +40,15 @@ rust_defaults {
         "libthiserror",
     ],
     static_libs: [
-        "libgtest",
-        "libkeymint_vts_test_utils",
         "libkeystore2_ffi_test_utils",
     ],
     shared_libs: [
-        // libkeymint_vts_test_utils needs to be static for atest,
-        // and that pulls in keymint shared lib dependency
-        "android.hardware.security.keymint-V3-ndk",
-        "libbase",
-        "libbinder",
-        "libbinder_ndk",
-        "libcppbor_external",
-        "libcppcose_rkp",
         "libcrypto",
-        "libcutils",
         "libkeymaster_messages",
         "libkeymaster_portable",
-        "libkeymint_remote_prov_support",
         "libkeymint_support",
+        "libkeymint_vts_test_utils",
         "libkeystore-engine",
-        "libutils",
-        "packagemanager_aidl-cpp",
     ],
 }
 
@@ -94,14 +81,12 @@ cc_library_static {
         "libkeystore2_ffi_test_utils_bridge_header",
     ],
     generated_sources: ["libkeystore2_ffi_test_utils_bridge_code"],
-    static_libs: [
-        "libkeymint_vts_test_utils",
-    ],
     shared_libs: [
         "libcppbor_external",
         "libkeymaster_messages",
         "libkeymaster_portable",
         "libkeystore-engine",
+        "libkeymint_vts_test_utils",
     ],
 }