Run avmdtool_tests as rust_test
We used to run avmdtool_tests as rust_test_host because rust_test
also runs the data_bins as test. Now the bug has been fixed, so
that we can change avmdtool_tests to rust_test to make it easier
to maintain.
Bug: 233732515
Test: atest avmdtool_tests
Change-Id: I58088b1f63c22caf49a6ae8328cb145aa80e167c
diff --git a/avmd/Android.bp b/avmd/Android.bp
index b09bed5..dc6a896 100644
--- a/avmd/Android.bp
+++ b/avmd/Android.bp
@@ -36,15 +36,11 @@
],
}
-rust_test_host {
+rust_test {
name: "avmdtool_tests",
srcs: ["tests/*_test.rs"],
test_suites: ["general-tests"],
- prefer_rlib: true,
- data: ["tests/data/*"],
+ compile_multilib: "first",
data_bins: ["avmdtool"],
- data_libs: [
- "libcrypto",
- "libz",
- ],
+ data: ["tests/data/*"],
}