Remove custom test_config.
Test: atest keystore2_test_utils_test
Change-Id: Ic88fcc5fa0eea0e8b5b03160a76d8e64fe699f06
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",
diff --git a/keystore2/test_utils/AndroidTest.xml b/keystore2/test_utils/AndroidTest.xml
deleted file mode 100644
index 24e277a..0000000
--- a/keystore2/test_utils/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration description="Config to run keystore2_test_utils_test device tests.">
- <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="cleanup" value="true" />
- <option
- name="push"
- value="keystore2_test_utils_test->/data/local/tmp/keystore2_test_utils_test"
- />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.rust.RustBinaryTest" >
- <option name="test-device-path" value="/data/local/tmp" />
- <option name="module-name" value="keystore2_test_utils_test" />
- </test>
-</configuration>
\ No newline at end of file