Use static libraries for multilib VTS
Move the `keystore2_client_tests` VTS `rust_binary` back to the default
value for `compile_multilib` (both), effectively reverting
aosp/2877436 and aosp/2989155.
Instead move various `shared_libs` dependencies to be `static_libs`,
as per https://b.corp.google.com/issues/298668920#comment34.
Bug: 314110490
Bug: 351099311
Bug: 362676017
Bug: 360287577
Test: Build, TreeHugger
Test: vts-tradefed then run vts --abi armeabi-v7a -m keystore2_client_tests
Change-Id: I4bae1255764b1687e5db6aec799057ac5612c200
diff --git a/keystore2/tests/Android.bp b/keystore2/tests/Android.bp
index ca9f5e3..dbef46c 100644
--- a/keystore2/tests/Android.bp
+++ b/keystore2/tests/Android.bp
@@ -24,11 +24,16 @@
rust_test {
name: "keystore2_client_tests",
- compile_multilib: "first",
defaults: [
"keymint_use_latest_hal_aidl_rust",
"keystore2_use_latest_aidl_rust",
],
+ static_libs: [
+ // Also include static_libs for the NDK variants so that they are available
+ // for dependencies.
+ "android.system.keystore2-V4-ndk",
+ "android.hardware.security.keymint-V3-ndk",
+ ],
srcs: ["keystore2_client_tests.rs"],
test_suites: [
"general-tests",