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/keystore-engine/Android.bp b/keystore-engine/Android.bp
index 3087675..88ae016 100644
--- a/keystore-engine/Android.bp
+++ b/keystore-engine/Android.bp
@@ -21,9 +21,14 @@
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",