From 7c8d9bbaf13fa744ac75f98989da71b8d1ba74ef Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 13 Jan 2017 21:42:09 +0000 Subject: [PATCH] Revert "move VTS HIDL HAL tests to the corresponding interface directories" This reverts commit ec7746fa808e4814b07a1b8018c7ee44f16cc9a6. Test: no test Merged-In: I9ec4493403d71419df99fe9761211eab057cdb0a Change-Id: I39f2acaa5ee376b90bcddd0891ac6f309cb40a2b --- Android.mk | 19 --- audio/Android.mk | 19 --- audio/effect/2.0/vts/Android.mk | 21 ---- audio/effect/2.0/vts/functional/Android.mk | 19 --- .../effect/2.0/vts/functional/vts/Android.mk | 19 --- .../vts/functional/vts/testcases/Android.mk | 19 --- .../functional/vts/testcases/hal/Android.mk | 19 --- .../vts/testcases/hal/audio/Android.mk | 19 --- .../vts/testcases/hal/audio/effect/Android.mk | 19 --- .../hal/audio/effect/hidl/Android.mk | 19 --- .../hal/audio/effect/hidl/target/Android.mk | 25 ---- .../audio/effect/hidl/target/AndroidTest.xml | 30 ----- audio/effect/Android.mk | 19 --- health/Android.mk | 19 --- light/Android.mk | 19 --- memtrack/Android.mk | 19 --- nfc/1.0/vts/functional/Android.mk | 19 --- nfc/1.0/vts/functional/vts/Android.mk | 19 --- .../vts/functional/vts/testcases/Android.mk | 19 --- .../functional/vts/testcases/hal/Android.mk | 19 --- .../vts/testcases/hal/nfc/Android.mk | 19 --- .../vts/testcases/hal/nfc/__init__.py | 0 .../vts/testcases/hal/nfc/hidl/Android.mk | 19 --- .../vts/testcases/hal/nfc/hidl/__init__.py | 0 .../testcases/hal/nfc/hidl/host/Android.mk | 19 --- .../hal/nfc/hidl/host/NfcHidlBasicTest.py | 110 ------------------ .../testcases/hal/nfc/hidl/host/__init__.py | 0 .../hal/nfc/hidl/host/binderize/Android.mk | 23 ---- .../nfc/hidl/host/binderize/AndroidTest.xml | 30 ----- .../NfcHidlBinderizeBasicTest.config | 3 - .../hal/nfc/hidl/host/binderize/__init__.py | 0 .../hal/nfc/hidl/host/passthrough/Android.mk | 23 ---- .../nfc/hidl/host/passthrough/AndroidTest.xml | 30 ----- .../NfcHidlPassthroughBasicTest.config | 11 -- .../testcases/hal/nfc/hidl/target/Android.mk | 25 ---- .../hal/nfc/hidl/target/AndroidTest.xml | 31 ----- .../target/HalNfcHidlTargetBasicTest.config | 10 -- .../hal/nfc/hidl/target_profiling/Android.mk | 23 ---- .../nfc/hidl/target_profiling/AndroidTest.xml | 31 ----- nfc/Android.mk | 19 --- power/Android.mk | 19 --- radio/Android.mk | 19 --- sensors/Android.mk | 19 --- tests/Android.mk | 19 --- tests/bar/Android.mk | 19 --- tests/baz/Android.mk | 19 --- tests/expression/Android.mk | 19 --- tests/foo/Android.mk | 19 --- tests/inheritance/Android.mk | 19 --- tests/libhwbinder/Android.mk | 19 --- tests/msgq/Android.mk | 19 --- tests/pointer/Android.mk | 19 --- thermal/1.0/vts/functional/Android.mk | 19 --- thermal/1.0/vts/functional/vts/Android.mk | 19 --- .../vts/functional/vts/testcases/Android.mk | 19 --- .../functional/vts/testcases/hal/Android.mk | 19 --- .../vts/testcases/hal/thermal/Android.mk | 19 --- .../vts/testcases/hal/thermal/__init__.py | 0 .../vts/testcases/hal/thermal/hidl/Android.mk | 19 --- .../testcases/hal/thermal/hidl/__init__.py | 0 .../hal/thermal/hidl/target/Android.mk | 25 ---- .../hal/thermal/hidl/target/AndroidTest.xml | 31 ----- .../thermal/hidl/target_profiling/Android.mk | 23 ---- .../hidl/target_profiling/AndroidTest.xml | 32 ----- thermal/Android.mk | 19 --- tv/Android.mk | 19 --- tv/cec/Android.mk | 19 --- tv/input/Android.mk | 19 --- vehicle/Android.mk | 19 --- vibrator/1.0/vts/functional/Android.mk | 19 --- vibrator/1.0/vts/functional/vts/Android.mk | 19 --- .../vts/functional/vts/testcases/Android.mk | 19 --- .../functional/vts/testcases/hal/Android.mk | 19 --- .../vts/testcases/hal/vibrator/Android.mk | 19 --- .../vts/testcases/hal/vibrator/__init__.py | 0 .../testcases/hal/vibrator/hidl/Android.mk | 19 --- .../testcases/hal/vibrator/hidl/__init__.py | 0 .../hal/vibrator/hidl/host/Android.mk | 23 ---- .../hal/vibrator/hidl/host/AndroidTest.xml | 28 ----- .../vibrator/hidl/host/VibratorHidlTest.py | 81 ------------- .../hal/vibrator/hidl/host/__init__.py | 0 .../vibrator/hidl/host_profiling/Android.mk | 23 ---- .../hidl/host_profiling/AndroidTest.xml | 29 ----- .../hal/vibrator/hidl/target/Android.bp | 33 ------ .../hal/vibrator/hidl/target/Android.mk | 25 ---- .../hal/vibrator/hidl/target/AndroidTest.xml | 31 ----- .../vibrator/hidl/target_profiling/Android.mk | 23 ---- .../hidl/target_profiling/AndroidTest.xml | 32 ----- vibrator/Android.mk | 19 --- 89 files changed, 1834 deletions(-) delete mode 100644 Android.mk delete mode 100644 audio/Android.mk delete mode 100644 audio/effect/2.0/vts/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/vts/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/vts/testcases/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/vts/testcases/hal/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/vts/testcases/hal/audio/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/Android.mk delete mode 100644 audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/AndroidTest.xml delete mode 100644 audio/effect/Android.mk delete mode 100644 health/Android.mk delete mode 100644 light/Android.mk delete mode 100644 memtrack/Android.mk delete mode 100644 nfc/1.0/vts/functional/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/HalNfcHidlTargetBasicTest.config delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk delete mode 100644 nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml delete mode 100644 nfc/Android.mk delete mode 100644 power/Android.mk delete mode 100644 radio/Android.mk delete mode 100644 sensors/Android.mk delete mode 100644 tests/Android.mk delete mode 100644 tests/bar/Android.mk delete mode 100644 tests/baz/Android.mk delete mode 100644 tests/expression/Android.mk delete mode 100644 tests/foo/Android.mk delete mode 100644 tests/inheritance/Android.mk delete mode 100644 tests/libhwbinder/Android.mk delete mode 100644 tests/msgq/Android.mk delete mode 100644 tests/pointer/Android.mk delete mode 100644 thermal/1.0/vts/functional/Android.mk delete mode 100644 thermal/1.0/vts/functional/vts/Android.mk delete mode 100644 thermal/1.0/vts/functional/vts/testcases/Android.mk delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/Android.mk delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/thermal/Android.mk delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/thermal/__init__.py delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/Android.mk delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/__init__.py delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/Android.mk delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/AndroidTest.xml delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/Android.mk delete mode 100644 thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/AndroidTest.xml delete mode 100644 thermal/Android.mk delete mode 100644 tv/Android.mk delete mode 100644 tv/cec/Android.mk delete mode 100644 tv/input/Android.mk delete mode 100644 vehicle/Android.mk delete mode 100644 vibrator/1.0/vts/functional/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/__init__.py delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/__init__.py delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/AndroidTest.xml delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/__init__.py delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/AndroidTest.xml delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.bp delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/AndroidTest.xml delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/Android.mk delete mode 100644 vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/AndroidTest.xml delete mode 100644 vibrator/Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/Android.mk b/audio/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/effect/2.0/vts/Android.mk b/audio/effect/2.0/vts/Android.mk deleted file mode 100644 index abdd5bf186..0000000000 --- a/audio/effect/2.0/vts/Android.mk +++ /dev/null @@ -1,21 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/audio/effect/2.0/vts/functional/Android.mk b/audio/effect/2.0/vts/functional/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/effect/2.0/vts/functional/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/effect/2.0/vts/functional/vts/Android.mk b/audio/effect/2.0/vts/functional/vts/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/effect/2.0/vts/functional/vts/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/effect/2.0/vts/functional/vts/testcases/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/effect/2.0/vts/functional/vts/testcases/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/effect/2.0/vts/functional/vts/testcases/hal/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/Android.mk b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/Android.mk deleted file mode 100644 index fe5ea0f6cd..0000000000 --- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/Android.mk +++ /dev/null @@ -1,25 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) - -include $(CLEAR_VARS) - -LOCAL_MODULE := HalAudioEffectHidlTargetBasicTest -VTS_CONFIG_SRC_DIR := testcases/hal/audio/effect/hidl/target -include test/vts/tools/build/Android.host_config.mk diff --git a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/AndroidTest.xml b/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/AndroidTest.xml deleted file mode 100644 index f0af67a089..0000000000 --- a/audio/effect/2.0/vts/functional/vts/testcases/hal/audio/effect/hidl/target/AndroidTest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/audio/effect/Android.mk b/audio/effect/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/audio/effect/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/health/Android.mk b/health/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/health/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/light/Android.mk b/light/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/light/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/memtrack/Android.mk b/memtrack/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/memtrack/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/Android.mk b/nfc/1.0/vts/functional/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/Android.mk b/nfc/1.0/vts/functional/vts/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/Android.mk b/nfc/1.0/vts/functional/vts/testcases/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py deleted file mode 100644 index de01f4352e..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/NfcHidlBasicTest.py +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/env python3.4 -# -# 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. -# - -import logging -import time - -from vts.runners.host import asserts -from vts.runners.host import base_test_with_webdb -from vts.runners.host import test_runner -from vts.utils.python.controllers import android_device - -PASSTHROUGH_MODE_KEY = "passthrough_mode" - - -class NfcHidlBasicTest(base_test_with_webdb.BaseTestWithWebDbClass): - """A simple testcase for the NFC HIDL HAL.""" - - def setUpClass(self): - """Creates a mirror and turns on the framework-layer NFC service.""" - self.dut = self.registerController(android_device)[0] - - self.getUserParams(opt_param_names=[PASSTHROUGH_MODE_KEY]) - - self.dut.shell.InvokeTerminal("one") - self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode - self.dut.shell.one.Execute("svc nfc disable") # Turn off - time.sleep(5) - - if getattr(self, PASSTHROUGH_MODE_KEY, True): - self.dut.shell.one.Execute( - "setprop vts.hal.vts.hidl.get_stub true") - else: - self.dut.shell.one.Execute( - "setprop vts.hal.vts.hidl.get_stub false") - - self.dut.hal.InitHidlHal( - target_type="nfc", - target_basepaths=self.dut.libPaths, - target_version=1.0, - target_package="android.hardware.nfc", - target_component_name="INfc", - hw_binder_service_name="nfc_nci", - bits=64 if self.dut.is64Bit else 32) - - def tearDownClass(self): - """Turns off the framework-layer NFC service.""" - # Ideally, we would want to store the nfc service's state before - # turning that off in setUpClass and restore the original state. - self.dut.shell.one.Execute("svc nfc disable") # make sure it's off - - def testBase(self): - """A simple test case which just calls each registered function.""" - # TODO: extend to make realistic testcases - # For example, call after CORE_INIT_RSP is received. - # result = self.dut.hal.nfc.coreInitialized([1]) - # logging.info("coreInitialized result: %s", result) - - def send_event(NfcEvent, NfcStatus): - logging.info("callback send_event") - logging.info("arg0 %s", NfcEvent) - logging.info("arg1 %s", NfcStatus) - - def send_data(NfcData): - logging.info("callback send_data") - logging.info("arg0 %s", NfcData) - - client_callback = self.dut.hal.nfc.GetHidlCallbackInterface( - "INfcClientCallback", - sendEvent=send_event, - sendData=send_data) - - result = self.dut.hal.nfc.open(client_callback) - logging.info("open result: %s", result) - - result = self.dut.hal.nfc.prediscover() - logging.info("prediscover result: %s", result) - - result = self.dut.hal.nfc.controlGranted() - logging.info("controlGranted result: %s", result) - - result = self.dut.hal.nfc.powerCycle() - logging.info("powerCycle result: %s", result) - - nfc_types = self.dut.hal.nfc.GetHidlTypeInterface("types") - logging.info("nfc_types: %s", nfc_types) - - result = self.dut.hal.nfc.write([0, 1, 2, 3, 4, 5]) - logging.info("write result: %s", result) - - result = self.dut.hal.nfc.close() - logging.info("close result: %s", result) - - self.SetCoverageData(self.dut.hal.nfc.GetRawCodeCoverage()) - -if __name__ == "__main__": - test_runner.main() diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk deleted file mode 100644 index cd58d323a2..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/Android.mk +++ /dev/null @@ -1,23 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := NfcHidlBinderizeBasicTest -VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/host/binderize -include test/vts/tools/build/Android.host_config.mk diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml deleted file mode 100644 index 9671977683..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/AndroidTest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config deleted file mode 100644 index 5a94c6fa42..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/NfcHidlBinderizeBasicTest.config +++ /dev/null @@ -1,3 +0,0 @@ -{ - "passthrough_mode": False -} diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/binderize/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk deleted file mode 100644 index e274107d43..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/Android.mk +++ /dev/null @@ -1,23 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := NfcHidlPassthroughBasicTest -VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/host/passthrough -include test/vts/tools/build/Android.host_config.mk diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml deleted file mode 100644 index 2f5fdfac8b..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/AndroidTest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config deleted file mode 100644 index c2429e0d65..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/host/passthrough/NfcHidlPassthroughBasicTest.config +++ /dev/null @@ -1,11 +0,0 @@ -{ - "passthrough_mode": true, - "coverage": true, - "modules": [{ - "module_name": "system/lib64/hw/nfc_nci.bullhead", - "git_project": { - "name": "platform/system/nfc", - "path": "system/nfc" - } - }] -} diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk deleted file mode 100644 index da9b6af8e4..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/Android.mk +++ /dev/null @@ -1,25 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) - -include $(CLEAR_VARS) - -LOCAL_MODULE := HalNfcHidlTargetBasicTest -VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/target -include test/vts/tools/build/Android.host_config.mk diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml deleted file mode 100644 index ee02488bdf..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/AndroidTest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/HalNfcHidlTargetBasicTest.config b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/HalNfcHidlTargetBasicTest.config deleted file mode 100644 index e6b5a2c06c..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target/HalNfcHidlTargetBasicTest.config +++ /dev/null @@ -1,10 +0,0 @@ -{ - "coverage": true, - "modules": [{ - "module_name": "system/lib64/hw/nfc_nci.bullhead", - "git_project": { - "name": "platform/system/nfc", - "path": "system/nfc" - } - }] -} diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk deleted file mode 100644 index c7bf8533fe..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/Android.mk +++ /dev/null @@ -1,23 +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. -# # - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := NfcHidlTargetProfilingTest -VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/target_profiling -include test/vts/tools/build/Android.host_config.mk diff --git a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml b/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml deleted file mode 100644 index da6cf22d86..0000000000 --- a/nfc/1.0/vts/functional/vts/testcases/hal/nfc/hidl/target_profiling/AndroidTest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/nfc/Android.mk b/nfc/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/nfc/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/power/Android.mk b/power/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/power/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/radio/Android.mk b/radio/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/radio/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/sensors/Android.mk b/sensors/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/sensors/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/bar/Android.mk b/tests/bar/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/bar/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/baz/Android.mk b/tests/baz/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/baz/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/expression/Android.mk b/tests/expression/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/expression/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/foo/Android.mk b/tests/foo/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/foo/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/inheritance/Android.mk b/tests/inheritance/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/inheritance/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/libhwbinder/Android.mk b/tests/libhwbinder/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/libhwbinder/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/msgq/Android.mk b/tests/msgq/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/msgq/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/pointer/Android.mk b/tests/pointer/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tests/pointer/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/thermal/1.0/vts/functional/Android.mk b/thermal/1.0/vts/functional/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/thermal/1.0/vts/functional/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/thermal/1.0/vts/functional/vts/Android.mk b/thermal/1.0/vts/functional/vts/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/thermal/1.0/vts/functional/vts/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/thermal/1.0/vts/functional/vts/testcases/Android.mk b/thermal/1.0/vts/functional/vts/testcases/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/thermal/1.0/vts/functional/vts/testcases/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/thermal/1.0/vts/functional/vts/testcases/hal/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/__init__.py b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/__init__.py b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/Android.mk deleted file mode 100644 index 1c3ceb379e..0000000000 --- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/Android.mk +++ /dev/null @@ -1,25 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) - -include $(CLEAR_VARS) - -LOCAL_MODULE := ThermalHidlTargetTest -VTS_CONFIG_SRC_DIR := testcases/hal/thermal/hidl/target -include test/vts/tools/build/Android.host_config.mk diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/AndroidTest.xml b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/AndroidTest.xml deleted file mode 100644 index cc159b9270..0000000000 --- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target/AndroidTest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/Android.mk b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/Android.mk deleted file mode 100644 index 1f937fa6c3..0000000000 --- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/Android.mk +++ /dev/null @@ -1,23 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := ThermalHidlTargetProfilingTest -VTS_CONFIG_SRC_DIR := testcases/hal/thermal/hidl/target_profiling -include test/vts/tools/build/Android.host_config.mk diff --git a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/AndroidTest.xml b/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/AndroidTest.xml deleted file mode 100644 index e5153deb12..0000000000 --- a/thermal/1.0/vts/functional/vts/testcases/hal/thermal/hidl/target_profiling/AndroidTest.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - diff --git a/thermal/Android.mk b/thermal/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/thermal/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tv/Android.mk b/tv/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tv/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tv/cec/Android.mk b/tv/cec/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tv/cec/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tv/input/Android.mk b/tv/input/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/tv/input/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/vehicle/Android.mk b/vehicle/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/vehicle/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/vibrator/1.0/vts/functional/Android.mk b/vibrator/1.0/vts/functional/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/vibrator/1.0/vts/functional/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/vibrator/1.0/vts/functional/vts/Android.mk b/vibrator/1.0/vts/functional/vts/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/vibrator/1.0/vts/functional/vts/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/vibrator/1.0/vts/functional/vts/testcases/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/__init__.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/__init__.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/Android.mk deleted file mode 100644 index d0054505c6..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/Android.mk +++ /dev/null @@ -1,23 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := VibratorHidlTest -VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/host -include test/vts/tools/build/Android.host_config.mk \ No newline at end of file diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/AndroidTest.xml b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/AndroidTest.xml deleted file mode 100644 index c5074eed0d..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/AndroidTest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py deleted file mode 100644 index cf8997b831..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env python3.4 -# -# 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. -# - -import logging -import time - -from vts.runners.host import asserts -from vts.runners.host import base_test_with_webdb -from vts.runners.host import test_runner -from vts.utils.python.controllers import android_device -from vts.utils.python.profiling import profiling_utils - - -class VibratorHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): - """A simple testcase for the VIBRATOR HIDL HAL.""" - - def setUpClass(self): - """Creates a mirror and turns on the framework-layer VIBRATOR service.""" - self.dut = self.registerController(android_device)[0] - - self.dut.shell.InvokeTerminal("one") - self.dut.shell.one.Execute("setenforce 0") # SELinux permissive mode - - # Test using the binderized mode - self.dut.shell.one.Execute( - "setprop vts.hal.vts.hidl.get_stub true") - - if getattr(self, self.ENABLE_PROFILING, False): - profiling_utils.EnableVTSProfiling(self.dut.shell.one) - - self.dut.hal.InitHidlHal( - target_type="vibrator", - target_basepaths=self.dut.libPaths, - target_version=1.0, - target_package="android.hardware.vibrator", - target_component_name="IVibrator", - bits=64 if self.dut.is64Bit else 32) - - def tearDownClass(self): - """ If profiling is enabled for the test, collect the profiling data - and disable profiling after the test is done. - """ - if getattr(self, self.ENABLE_PROFILING, False): - profiling_trace_path = getattr( - self, self.VTS_PROFILING_TRACING_PATH, "") - self.ProcessAndUploadTraceData(self.dut, profiling_trace_path) - profiling_utils.DisableVTSProfiling(self.dut.shell.one) - - def testVibratorBasic(self): - """A simple test case which just calls each registered function.""" - vibrator_types = self.dut.hal.vibrator.GetHidlTypeInterface("types") - logging.info("vibrator_types: %s", vibrator_types) - logging.info("OK: %s", vibrator_types.OK) - logging.info("ERR: %s", vibrator_types.ERR) - - result = self.dut.hal.vibrator.on(10000) - logging.info("on result: %s", result) - asserts.assertEqual(vibrator_types.OK, result) - - time.sleep(1) - - result = self.dut.hal.vibrator.off() - logging.info("off result: %s", result) - asserts.assertEqual(vibrator_types.OK, result) - -if __name__ == "__main__": - test_runner.main() diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/__init__.py b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/Android.mk deleted file mode 100644 index ec73e06eb2..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/Android.mk +++ /dev/null @@ -1,23 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := VibratorHidlProfilingTest -VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/host_profiling -include test/vts/tools/build/Android.host_config.mk diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/AndroidTest.xml b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/AndroidTest.xml deleted file mode 100644 index 54830f0573..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host_profiling/AndroidTest.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.bp b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.bp deleted file mode 100644 index b6ee3a37f3..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.bp +++ /dev/null @@ -1,33 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) - -include $(CLEAR_VARS) - -LOCAL_MODULE := VibratorHidlTargetTest -VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target -LOCAL_MODULE_CLASS := FAKE -LOCAL_IS_HOST_MODULE := true -LOCAL_COMPATIBILITY_SUITE := vts - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): - @echo "VTS host-driven test target: $(LOCAL_MODULE)" - $(hide) touch $@ diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.mk deleted file mode 100644 index 704d98515f..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/Android.mk +++ /dev/null @@ -1,25 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles) - -include $(CLEAR_VARS) - -LOCAL_MODULE := VibratorHidlTargetTest -VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target -include test/vts/tools/build/Android.host_config.mk diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/AndroidTest.xml b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/AndroidTest.xml deleted file mode 100644 index 7948c86691..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target/AndroidTest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/Android.mk b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/Android.mk deleted file mode 100644 index a1f43e4718..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/Android.mk +++ /dev/null @@ -1,23 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := VibratorHidlTargetProfilingTest -VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target_profiling -include test/vts/tools/build/Android.host_config.mk diff --git a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/AndroidTest.xml b/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/AndroidTest.xml deleted file mode 100644 index 4643e23c7d..0000000000 --- a/vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/target_profiling/AndroidTest.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - diff --git a/vibrator/Android.mk b/vibrator/Android.mk deleted file mode 100644 index f9e32763ff..0000000000 --- a/vibrator/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(call all-subdir-makefiles)