commit 1edfbea3550e2747050eb9042defb724d859ff10
author Joel Galenson <jgalenson@google.com> Tue Oct 26 13:41:07 2021 -0700
committer Joel Galenson <jgalenson@google.com> Tue Oct 26 13:41:07 2021 -0700
tree ee5a8826ca3279f3fe6731d21144b4663d75c656
parent 22670069bf89dc1c3605ba4fb87d91b3f01bc0b0

Remove custom test_config.

Test: atest keystore2_test_utils_test
Change-Id: Ic88fcc5fa0eea0e8b5b03160a76d8e64fe699f06

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 8efc330..e8cdb6c 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -98,11 +98,8 @@
     name: "keystore2_test_utils_test",
     srcs: ["test_utils/lib.rs"],
     test_suites: ["general-tests"],
-    // TODO Remove custom test_config and enable the following two lines when
-    //      b/200602232 was resolved.
-    // require_root: true,
-    // auto_gen_config: true,
-    test_config: "test_utils/AndroidTest.xml",
+    require_root: true,
+    auto_gen_config: true,
     compile_multilib: "first",
     rustlibs: [
         "libkeystore2_selinux",