summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Shi <dshi@google.com>2020-10-08 11:13:49 -0700
committerDan Shi <dshi@google.com>2020-10-08 11:13:49 -0700
commitbb923026fdfd18127270238a50a1b54469d19dfb (patch)
tree2a758bfe75d83e761ece8be149a76168494cf85b
parentf465eb8c7bd7596566a885c747304f117d801afe (diff)
downloadgsid-bb923026fdfd18127270238a50a1b54469d19dfb.tar.gz
Remove vts10 related configs
vts_config is a test wrapper used for VTS10 harness. The test is replaced by generic gtest and vts10 harness will be removed from S release. VtsGsiBootTest is replaced by vts_gsi_boot_test. Bug: 169584384 Test: build Change-Id: Ie02852be511fcfe49e10755d83d690d65ff95f6f
-rw-r--r--Android.bp4
-rw-r--r--AndroidTest.xml30
2 files changed, 0 insertions, 34 deletions
diff --git a/Android.bp b/Android.bp
index 74dc50e..1e9d3a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -136,7 +136,3 @@ filegroup {
],
path: "aidl",
}
-
-vts_config {
- name: "VtsGsiBootTest",
-}
diff --git a/AndroidTest.xml b/AndroidTest.xml
deleted file mode 100644
index 09ec7bd..0000000
--- a/AndroidTest.xml
+++ /dev/null
@@ -1,30 +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 for VTS VtsGsiBootTest">
- <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="VtsGsiBootTest"/>
- <option name="binary-test-source" value="_32bit::DATA/nativetest/gsi_boot_test/gsi_boot_test" />
- <option name="binary-test-source" value="_64bit::DATA/nativetest64/gsi_boot_test/gsi_boot_test" />
- <option name="binary-test-type" value="gtest"/>
- <option name="precondition-first-api-level" value="29" />
- <option name="test-timeout" value="1m"/>
- </test>
-</configuration>