Remove vts10 related configs am: 085d2725bb
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/security/+/1451035
Change-Id: Ie21fe573874c8d5c0d2796a03e2b3d41d2e7ff35
diff --git a/avb/Android.bp b/avb/Android.bp
index 0314b32..4726715 100644
--- a/avb/Android.bp
+++ b/avb/Android.bp
@@ -48,7 +48,3 @@
name: "VtsSecurityAvbTest",
defaults: ["vts_security_avb_defaults"],
}
-
-vts_config {
- name: "VtsSecurityAvb",
-}
diff --git a/avb/AndroidTest.xml b/avb/AndroidTest.xml
deleted file mode 100644
index 5d5301d..0000000
--- a/avb/AndroidTest.xml
+++ /dev/null
@@ -1,33 +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 AVB test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-security" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="abort-on-push-failure" value="false" />
- <option name="push-group" value="HalHidlTargetTest.push"/>
- <option name="push" value="DATA/avb/q-gsi.avbpubkey->/data/local/tmp/q-gsi.avbpubkey" />
- <option name="push" value="DATA/avb/r-gsi.avbpubkey->/data/local/tmp/r-gsi.avbpubkey" />
- <option name="push" value="DATA/avb/s-gsi.avbpubkey->/data/local/tmp/s-gsi.avbpubkey" />
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsSecurityAvb" />
- <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsSecurityAvbTest/VtsSecurityAvbTest" />
- <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsSecurityAvbTest/VtsSecurityAvbTest" />
- <option name="binary-test-type" value="gtest" />
- <option name="precondition-first-api-level" value="29" />
- <option name="test-timeout" value="3m" />
- </test>
-</configuration>
diff --git a/poc/config/stable/Android.bp b/poc/config/stable/Android.bp
deleted file mode 100644
index a369f38..0000000
--- a/poc/config/stable/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (C) 2016 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.
-//
-
-vts_config {
- name: "SecurityPoCKernelTest",
-}
diff --git a/poc/config/stable/AndroidTest.xml b/poc/config/stable/AndroidTest.xml
deleted file mode 100644
index 5ab8177..0000000
--- a/poc/config/stable/AndroidTest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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 kernel security PoC test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-security" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HostDrivenTest.push" />
- <option name="cleanup" value="true" />
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="SecurityPoCKernelTest" />
- <option name="test-case-path" value="vts/testcases/security/poc/host/SecurityPoCKernelTest" />
- <option name="test-config-path" value="vts/testcases/security/poc/config/stable/SecurityPoCKernelTest.runner_conf" />
- </test>
-</configuration>
diff --git a/poc/config/staging/Android.bp b/poc/config/staging/Android.bp
deleted file mode 100644
index 55951b0..0000000
--- a/poc/config/staging/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (C) 2016 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.
-//
-
-vts_config {
- name: "SecurityPoCKernelTestStaging",
-}
diff --git a/poc/config/staging/AndroidTest.xml b/poc/config/staging/AndroidTest.xml
deleted file mode 100644
index 7625bde..0000000
--- a/poc/config/staging/AndroidTest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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 kernel security PoC test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-staging-kernel" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HostDrivenTest.push" />
- <option name="cleanup" value="true" />
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="SecurityPoCKernelTestStaging" />
- <option name="test-case-path" value="vts/testcases/security/poc/host/SecurityPoCKernelTest" />
- <option name="test-config-path" value="vts/testcases/security/poc/config/staging/SecurityPoCKernelTestStaging.runner_conf" />
- </test>
-</configuration>
diff --git a/selinux/policy/Android.bp b/selinux/policy/Android.bp
index c39044a..28f3523 100644
--- a/selinux/policy/Android.bp
+++ b/selinux/policy/Android.bp
@@ -32,7 +32,3 @@
],
}
-
-vts_config {
- name: "VtsSecuritySelinuxPolicyHost",
-}
diff --git a/selinux/policy/AndroidTest.xml b/selinux/policy/AndroidTest.xml
deleted file mode 100644
index 932b5f1..0000000
--- a/selinux/policy/AndroidTest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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 Security SELinux policy host-side test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-security" />
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsSecuritySelinuxPolicyHost"/>
- <option name="binary-test-source" value="out/host/linux-x86/bin/VtsSecuritySelinuxPolicyHostTest" />
- <option name="binary-test-type" value="host_binary_test"/>
- <option name="test-timeout" value="1m"/>
- </test>
-</configuration>
diff --git a/system_property/Android.bp b/system_property/Android.bp
index 7d18e63..a720c58 100644
--- a/system_property/Android.bp
+++ b/system_property/Android.bp
@@ -14,10 +14,6 @@
// limitations under the License.
//
-vts_config {
- name: "VtsTrebleSysProp",
-}
-
python_test_host {
name: "vts_treble_sys_prop_test",
main: "vts_treble_sys_prop_test.py",
diff --git a/system_property/AndroidTest.xml b/system_property/AndroidTest.xml
deleted file mode 100644
index c536ad6..0000000
--- a/system_property/AndroidTest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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 TrebleSysPropTest">
- <option name="config-descriptor:metadata" key="plan" value="vts-security" />
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="push-group" value="HostDrivenTest.push" />
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsTrebleSysProp" />
- <option name="test-case-path" value="vts/testcases/security/system_property/VtsTrebleSysPropTest" />
- <option name="precondition-first-api-level" value="28" />
- </test>
-</configuration>
