Snap for 6545159 from be7dffa7316362bd093dfc85ddc5a63dd79b5dd5 to mainline-releaseandroid-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-release

Change-Id: I21848629e5839c495eecb886cb93c3892d64735b

2 files changed, 0 insertions, 39 deletions

diff --git a/tests/Android.bp b/tests/Android.bp
index c915c00..989e029 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -31,12 +31,4 @@ cc_test {
         "map_test.cpp",
         "modular_heap_check.cpp",
     ],
-    test_suites: ["vts"],
-    auto_gen_config: true,
-    test_min_api_level: 30,
 }
-
-vts_config {
-    name: "VtsKernelLibIonTest",
-}
-
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
deleted file mode 100644
index e79f7f0..0000000
--- a/tests/AndroidTest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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 for VTS VtsKernelLibIonTest">
-    <option name="config-descriptor:metadata" key="plan" value="vts-kernel" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="abort-on-push-failure" value="false"/>
-        <option name="push-group" value="HostDrivenTest.push"/>
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-      <option name="test-module-name" value="VtsKernelLibIonTest"/>
-      <option name="binary-test-source" value="_32bit::DATA/nativetest/ion-unit-tests/ion-unit-tests" />
-        <option name="binary-test-source" value="_64bit::DATA/nativetest64/ion-unit-tests/ion-unit-tests" />
-        <option name="binary-test-type" value="gtest"/>
-        <option name="test-timeout" value="1m"/>
-        <option name="precondition-first-api-level" value="30" />
-    </test>
-</configuration>
-