commit 3f78dd8b81a602ec6cbee72942c0dde273487076
author Joel Galenson <jgalenson@google.com> Wed Jan 20 16:21:30 2021 -0800
committer Joel Galenson <jgalenson@google.com> Wed Jan 20 21:23:36 2021 -0800
tree 7d333a7cffee7259911cb3aa70f604ff8474b694
parent 38de1a9694c27cd03670c1e7f98eec4b77db1b38

Remove custom AndroidTest.xml

Test: atest keystore2_test
Test: Will wait for corresponding unicode-xid change
Change-Id: Ia56f1c438fab51a31d2dd0b76f68d07572cd7788

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 354a6d6..bd08bc8 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -42,9 +42,8 @@
     name: "keystore2_test",
     crate_name: "keystore2",
     srcs: ["src/lib.rs"],
-    test_suites: ["device-tests"],
-    auto_gen_config: false,
-    test_config: "AndroidTest.xml",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     rustlibs: [
         "android.hardware.security.keymint-rust",
         "android.security.apc-rust",