Merge "Created libkeystore-engine as cc-library instead of cc-test-library to avoid issues while linking shared libraries with Rust test binaries." into main

keystore-engine/Android.bp

@@ -21,9 +21,14 @@ package {
     default_applicable_licenses: ["system_security_license"],
 }
 
-cc_test_library {
+// This is expected to be cc_test_library but due to issue mentioned in b/298668920, b/314110490
+// we are creating cc_library and using static library to link with `keystore_client_tests`.
+cc_library {
     name: "libkeystore-engine",
 
+    defaults: [
+        "keystore2_use_latest_aidl_ndk_shared",
+    ],
     srcs: [
         "android_engine.cpp",
         "keystore2_engine.cpp",

keystore2/test_utils/Android.bp

@@ -43,13 +43,14 @@ rust_defaults {
     ],
     static_libs: [
         "libkeystore2_ffi_test_utils",
+        "libkeystore-engine",
     ],
     shared_libs: [
+        "android.system.keystore2-V3-ndk",
         "libbase",
         "libcrypto",
         "libkeymaster_portable",
         "libkeymint_support",
-        "libkeystore-engine",
     ],
 }
 
@@ -75,17 +76,18 @@ cc_library_static {
     srcs: ["ffi_test_utils.cpp"],
     defaults: [
         "keymint_use_latest_hal_aidl_ndk_shared",
+        "keystore2_use_latest_aidl_ndk_shared",
     ],
     generated_headers: [
         "cxx-bridge-header",
         "libkeystore2_ffi_test_utils_bridge_header",
     ],
     generated_sources: ["libkeystore2_ffi_test_utils_bridge_code"],
+    static_libs: ["libkeystore-engine"],
     shared_libs: [
         "libbase",
         "libcrypto",
         "libkeymaster_portable",
-        "libkeystore-engine",
         "libkeymint_support",
     ],
 }