diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-08 21:19:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-08 21:19:10 +0000 |
commit | 6da3a78adc740022e79251e02da1295a56e62837 (patch) | |
tree | 54db3e680706394ded150268ceb300c66f22596a | |
parent | 1ef9b569e53cad9b0f13aa8ca8c410c164aa65b1 (diff) | |
parent | 0ce5b1537b11e54d2fe42f764ca562a9fb047666 (diff) | |
download | vndk-6da3a78adc740022e79251e02da1295a56e62837.tar.gz |
Merge "Remove vts10 related configs" am: 0ce5b1537b
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/1451115
Change-Id: I1c9fd0e15c887630b14b4972e97d25c7ea5f04cc
-rw-r--r-- | abi/Android.bp | 19 | ||||
-rw-r--r-- | abi/AndroidTest.xml | 26 | ||||
-rw-r--r-- | dependency/Android.bp | 19 | ||||
-rw-r--r-- | dependency/AndroidTest.xml | 27 | ||||
-rw-r--r-- | files/Android.bp | 19 | ||||
-rw-r--r-- | files/AndroidTest.xml | 28 | ||||
-rw-r--r-- | hidl/bufferpool/V1_0/target/Android.bp | 19 | ||||
-rw-r--r-- | hidl/bufferpool/V1_0/target/AndroidTest.xml | 32 | ||||
-rw-r--r-- | hidl/bufferpool/V2_0/target/Android.bp | 19 | ||||
-rw-r--r-- | hidl/bufferpool/V2_0/target/AndroidTest.xml | 32 |
10 files changed, 0 insertions, 240 deletions
diff --git a/abi/Android.bp b/abi/Android.bp deleted file mode 100644 index 9479d3e..0000000 --- a/abi/Android.bp +++ /dev/null @@ -1,19 +0,0 @@ -// -// 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. -// - -vts_config { - name: "VtsVndkAbi", -} diff --git a/abi/AndroidTest.xml b/abi/AndroidTest.xml deleted file mode 100644 index cf220a6..0000000 --- a/abi/AndroidTest.xml +++ /dev/null @@ -1,26 +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 VNDK ABI test cases"> - <option name="config-descriptor:metadata" key="plan" value="vts-vndk" /> - <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="VtsVndkAbi" /> - <option name="test-case-path" value="vts/testcases/vndk/abi/VtsVndkAbiTest" /> - </test> -</configuration> - diff --git a/dependency/Android.bp b/dependency/Android.bp deleted file mode 100644 index d9715a1..0000000 --- a/dependency/Android.bp +++ /dev/null @@ -1,19 +0,0 @@ -// -// 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. -// - -vts_config { - name: "VtsVndkDependency", -} diff --git a/dependency/AndroidTest.xml b/dependency/AndroidTest.xml deleted file mode 100644 index 70c3138..0000000 --- a/dependency/AndroidTest.xml +++ /dev/null @@ -1,27 +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 VNDK dependency test cases"> - <option name="config-descriptor:metadata" key="plan" value="vts-vndk" /> - <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="VtsVndkDependency" /> - <option name="test-case-path" value="vts/testcases/vndk/dependency/VtsVndkDependencyTest" /> - <option name="test-timeout" value="6m" /> - </test> -</configuration> - diff --git a/files/Android.bp b/files/Android.bp deleted file mode 100644 index f2ff97c..0000000 --- a/files/Android.bp +++ /dev/null @@ -1,19 +0,0 @@ -// -// 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. -// - -vts_config { - name: "VtsVndkFiles", -} diff --git a/files/AndroidTest.xml b/files/AndroidTest.xml deleted file mode 100644 index b422922..0000000 --- a/files/AndroidTest.xml +++ /dev/null @@ -1,28 +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 VNDK files test cases"> - <option name="config-descriptor:metadata" key="plan" value="vts-vndk" /> - <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher"> - <option name="push-group" value="HostDrivenTest.push" /> - </target_preparer> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"> - </multi_target_preparer> - <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> - <option name="test-module-name" value="VtsVndkFiles" /> - <option name="test-case-path" value="vts/testcases/vndk/files/VtsVndkFilesTest" /> - </test> -</configuration> - diff --git a/hidl/bufferpool/V1_0/target/Android.bp b/hidl/bufferpool/V1_0/target/Android.bp deleted file mode 100644 index f4f798f..0000000 --- a/hidl/bufferpool/V1_0/target/Android.bp +++ /dev/null @@ -1,19 +0,0 @@ -// -// 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. -// - -vts_config { - name: "VtsVndkHidlBufferpoolV1_0Target", -} diff --git a/hidl/bufferpool/V1_0/target/AndroidTest.xml b/hidl/bufferpool/V1_0/target/AndroidTest.xml deleted file mode 100644 index b1c11d0..0000000 --- a/hidl/bufferpool/V1_0/target/AndroidTest.xml +++ /dev/null @@ -1,32 +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 VtsVndkHidlBufferpoolV1_0Target test cases"> - <option name="config-descriptor:metadata" key="plan" value="vts-library" /> - <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" /> - <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> - <option name="test-module-name" value="VtsVndkHidlBufferpoolV1_0Target"/> - <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsVndkHidlBufferpoolV1_0TargetSingleTest/VtsVndkHidlBufferpoolV1_0TargetSingleTest"/> - <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsVndkHidlBufferpoolV1_0TargetSingleTest/VtsVndkHidlBufferpoolV1_0TargetSingleTest"/> - <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsVndkHidlBufferpoolV1_0TargetMultiTest/VtsVndkHidlBufferpoolV1_0TargetMultiTest"/> - <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsVndkHidlBufferpoolV1_0TargetMultiTest/VtsVndkHidlBufferpoolV1_0TargetMultiTest"/> - <option name="binary-test-type" value="gtest_binary_test"/> - <option name="test-timeout" value="1m"/> - </test> -</configuration> diff --git a/hidl/bufferpool/V2_0/target/Android.bp b/hidl/bufferpool/V2_0/target/Android.bp deleted file mode 100644 index 9533bab..0000000 --- a/hidl/bufferpool/V2_0/target/Android.bp +++ /dev/null @@ -1,19 +0,0 @@ -// -// 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. -// - -vts_config { - name: "VtsVndkHidlBufferpoolV2_0Target", -} diff --git a/hidl/bufferpool/V2_0/target/AndroidTest.xml b/hidl/bufferpool/V2_0/target/AndroidTest.xml deleted file mode 100644 index d3241e9..0000000 --- a/hidl/bufferpool/V2_0/target/AndroidTest.xml +++ /dev/null @@ -1,32 +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 VtsVndkHidlBufferpoolV2_0Target test cases"> - <option name="config-descriptor:metadata" key="plan" value="vts-library" /> - <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> - <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" /> - <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> - <option name="test-module-name" value="VtsVndkHidlBufferpoolV2_0Target"/> - <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsVndkHidlBufferpoolV2_0TargetSingleTest/VtsVndkHidlBufferpoolV2_0TargetSingleTest"/> - <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsVndkHidlBufferpoolV2_0TargetSingleTest/VtsVndkHidlBufferpoolV2_0TargetSingleTest"/> - <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsVndkHidlBufferpoolV2_0TargetMultiTest/VtsVndkHidlBufferpoolV2_0TargetMultiTest"/> - <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsVndkHidlBufferpoolV2_0TargetMultiTest/VtsVndkHidlBufferpoolV2_0TargetMultiTest"/> - <option name="binary-test-type" value="gtest_binary_test"/> - <option name="test-timeout" value="1m"/> - </test> -</configuration> |