summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTri Vo <trong@google.com>2019-03-01 09:59:08 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-03-01 09:59:08 -0800
commitdd7156f26e8279332995f90d734c6b1c96b67bca (patch)
tree1d86296e3858633cda03a516496e545b90f4941f
parenta78a06d7d3a7c5d8afb20b4f31ff4abb19bcd6fb (diff)
parentee40e5225e342a8220d8e1edfb8b628c3182392b (diff)
downloadlibhardware_legacy-dd7156f26e8279332995f90d734c6b1c96b67bca.tar.gz
Merge "libpower: remove VTS configs" am: 2bd0b3da7e
am: ee40e5225e Change-Id: I61d6953420519c898b11997ad87f17135b719447
-rw-r--r--vts/Android.mk22
-rw-r--r--vts/AndroidTest.xml30
2 files changed, 0 insertions, 52 deletions
diff --git a/vts/Android.mk b/vts/Android.mk
deleted file mode 100644
index 9ad398f..0000000
--- a/vts/Android.mk
+++ /dev/null
@@ -1,22 +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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsLibpowerTest
-include test/vts/tools/build/Android.host_config.mk
diff --git a/vts/AndroidTest.xml b/vts/AndroidTest.xml
deleted file mode 100644
index 0230291..0000000
--- a/vts/AndroidTest.xml
+++ /dev/null
@@ -1,30 +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 VtsLibpowerTest test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-systems" />
- <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"/>
- </target_preparer>
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsLibpowerTest"/>
- <option name="binary-test-source" value="_32bit::DATA/nativetest/libpower_test/libpower_test"/>
- <option name="binary-test-source" value="_64bit::DATA/nativetest64/libpower_test/libpower_test"/>
- <option name="binary-test-type" value="hal_hidl_gtest"/>
- <option name="binary-test-disable-framework" value="true"/>
- <option name="test-timeout" value="5m"/>
- </test>
-</configuration>