Created libkeystore-engine as cc-library instead of cc-test-library to
avoid issues while linking shared libraries with Rust test binaries.
This change is made to avoid vts-tradefed failure to link the shared
library while running the Rust VTS `keystore2_client_tests` test
suite. As suggested in b/314110490#24 using the libkeystore-engine
static-library to run keystore2_client_tests.
Bug: 314110490, 298668920
Test: atest keystore2_client_tests; run vts -m keystore2_client_tests
Change-Id: If956865eeb4af908f33b1ad81a2b2e26300aae0e
diff --git a/keystore2/test_utils/Android.bp b/keystore2/test_utils/Android.bp
index c16aa12..e37ba60 100644
--- a/keystore2/test_utils/Android.bp
+++ b/keystore2/test_utils/Android.bp
@@ -43,13 +43,14 @@
],
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 @@
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",
],
}