move files to new versioned dirs
Test: run some tests
Bug: 34983031
Change-Id: I248c9e6b157b06b9ca7ba8ee202af6b8f72f1ffd
diff --git a/audio/effect/hidl/target/Android.mk b/audio/effect/V2_0/target/Android.mk
similarity index 92%
rename from audio/effect/hidl/target/Android.mk
rename to audio/effect/V2_0/target/Android.mk
index fe5ea0f..2cad20b 100644
--- a/audio/effect/hidl/target/Android.mk
+++ b/audio/effect/V2_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalAudioEffectHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/audio/effect/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/audio/effect/V2_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/audio/effect/hidl/target/AndroidTest.xml b/audio/effect/V2_0/target/AndroidTest.xml
similarity index 100%
rename from audio/effect/hidl/target/AndroidTest.xml
rename to audio/effect/V2_0/target/AndroidTest.xml
diff --git a/audio/effect/hidl/target_profiling/Android.mk b/audio/effect/V2_0/target_profiling/Android.mk
similarity index 92%
rename from audio/effect/hidl/target_profiling/Android.mk
rename to audio/effect/V2_0/target_profiling/Android.mk
index 430600d..5962297 100644
--- a/audio/effect/hidl/target_profiling/Android.mk
+++ b/audio/effect/V2_0/target_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalAudioEffectHidlTargetBasicProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/audio/effect/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/audio/effect/V2_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/audio/effect/hidl/target_profiling/AndroidTest.xml b/audio/effect/V2_0/target_profiling/AndroidTest.xml
similarity index 100%
rename from audio/effect/hidl/target_profiling/AndroidTest.xml
rename to audio/effect/V2_0/target_profiling/AndroidTest.xml
diff --git a/audio/effect/hidl/Android.mk b/audio/effect/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/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/vehicle/__init__.py b/automotive/__init__.py
similarity index 100%
copy from vehicle/__init__.py
copy to automotive/__init__.py
diff --git a/contexthub/hidl/__init__.py b/automotive/vehicle/V2_0/__init__.py
similarity index 100%
copy from contexthub/hidl/__init__.py
copy to automotive/vehicle/V2_0/__init__.py
diff --git a/vehicle/hidl/host/Android.mk b/automotive/vehicle/V2_0/host/Android.mk
similarity index 91%
rename from vehicle/hidl/host/Android.mk
rename to automotive/vehicle/V2_0/host/Android.mk
index 716a41c..73a9c69 100644
--- a/vehicle/hidl/host/Android.mk
+++ b/automotive/vehicle/V2_0/host/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := VehicleHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vehicle/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/automotive/vehicle/V2_0/host
include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/vehicle/hidl/host/AndroidTest.xml b/automotive/vehicle/V2_0/host/AndroidTest.xml
similarity index 93%
rename from vehicle/hidl/host/AndroidTest.xml
rename to automotive/vehicle/V2_0/host/AndroidTest.xml
index 98fbe3d..5117e40 100644
--- a/vehicle/hidl/host/AndroidTest.xml
+++ b/automotive/vehicle/V2_0/host/AndroidTest.xml
@@ -24,6 +24,6 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VehicleHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/automotive/vehicle/V2_0/host/VehicleHidlTest" />
</test>
</configuration>
diff --git a/vehicle/hidl/host/VehicleHidlTest.py b/automotive/vehicle/V2_0/host/VehicleHidlTest.py
similarity index 100%
rename from vehicle/hidl/host/VehicleHidlTest.py
rename to automotive/vehicle/V2_0/host/VehicleHidlTest.py
diff --git a/contexthub/hidl/host/__init__.py b/automotive/vehicle/V2_0/host/__init__.py
similarity index 100%
copy from contexthub/hidl/host/__init__.py
copy to automotive/vehicle/V2_0/host/__init__.py
diff --git a/vehicle/__init__.py b/automotive/vehicle/__init__.py
similarity index 100%
rename from vehicle/__init__.py
rename to automotive/vehicle/__init__.py
diff --git a/boot/hidl/target/Android.mk b/boot/V1_0/target/Android.mk
similarity index 93%
rename from boot/hidl/target/Android.mk
rename to boot/V1_0/target/Android.mk
index 844b93b..9d61e3e 100644
--- a/boot/hidl/target/Android.mk
+++ b/boot/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalBootHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/boot/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/boot/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/boot/hidl/target/AndroidTest.xml b/boot/V1_0/target/AndroidTest.xml
similarity index 96%
rename from boot/hidl/target/AndroidTest.xml
rename to boot/V1_0/target/AndroidTest.xml
index a3a0e9b..0018bba 100644
--- a/boot/hidl/target/AndroidTest.xml
+++ b/boot/V1_0/target/AndroidTest.xml
@@ -24,7 +24,7 @@
_32bit::DATA/nativetest/boot_hidl_hal_test/boot_hidl_hal_test,
_64bit::DATA/nativetest64/boot_hidl_hal_test/boot_hidl_hal_test,
"/>
- <option name="test-config-path" value="vts/testcases/hal/boot/hidl/target/HalBootHidlTargetTest.config" />
+ <option name="test-config-path" value="vts/testcases/hal/boot/V1_0/target/HalBootHidlTargetTest.config" />
<option name="binary-test-type" value="hal_hidl_gtest" />
<option name="precondition-lshal" value="android.hardware.boot@1.0" />
<option name="test-timeout" value="1m" />
diff --git a/boot/hidl/target/HalBootHidlTargetTest.config b/boot/V1_0/target/HalBootHidlTargetTest.config
similarity index 100%
rename from boot/hidl/target/HalBootHidlTargetTest.config
rename to boot/V1_0/target/HalBootHidlTargetTest.config
diff --git a/boot/hidl/target_profiling/Android.mk b/boot/V1_0/target_profiling/Android.mk
similarity index 93%
rename from boot/hidl/target_profiling/Android.mk
rename to boot/V1_0/target_profiling/Android.mk
index f7414df..69d09c0 100644
--- a/boot/hidl/target_profiling/Android.mk
+++ b/boot/V1_0/target_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalBootHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/boot/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/boot/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/boot/hidl/target_profiling/AndroidTest.xml b/boot/V1_0/target_profiling/AndroidTest.xml
similarity index 100%
rename from boot/hidl/target_profiling/AndroidTest.xml
rename to boot/V1_0/target_profiling/AndroidTest.xml
diff --git a/boot/hidl/Android.mk b/boot/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/boot/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/broadcastradio/hidl/target/Android.mk b/broadcastradio/V1_0/target/Android.mk
similarity index 92%
rename from broadcastradio/hidl/target/Android.mk
rename to broadcastradio/V1_0/target/Android.mk
index 153dcd6..f40fca0 100644
--- a/broadcastradio/hidl/target/Android.mk
+++ b/broadcastradio/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalBroadcastRadioHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/broadcastradio/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/broadcastradio/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/broadcastradio/hidl/target/AndroidTest.xml b/broadcastradio/V1_0/target/AndroidTest.xml
similarity index 100%
rename from broadcastradio/hidl/target/AndroidTest.xml
rename to broadcastradio/V1_0/target/AndroidTest.xml
diff --git a/broadcastradio/hidl/Android.mk b/broadcastradio/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/broadcastradio/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/camera/provider/V2_4/Android.mk b/camera/provider/V2_4/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/camera/provider/V2_4/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/contexthub/hidl/__init__.py b/contexthub/V1_0/__init__.py
similarity index 100%
rename from contexthub/hidl/__init__.py
rename to contexthub/V1_0/__init__.py
diff --git a/contexthub/hidl/host/Android.mk b/contexthub/V1_0/host/Android.mk
similarity index 92%
rename from contexthub/hidl/host/Android.mk
rename to contexthub/V1_0/host/Android.mk
index aacf910..bdc5899 100644
--- a/contexthub/hidl/host/Android.mk
+++ b/contexthub/V1_0/host/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := ContexthubHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/contexthub/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/contexthub/V1_0/host
include test/vts/tools/build/Android.host_config.mk
diff --git a/contexthub/hidl/host/AndroidTest.xml b/contexthub/V1_0/host/AndroidTest.xml
similarity index 97%
rename from contexthub/hidl/host/AndroidTest.xml
rename to contexthub/V1_0/host/AndroidTest.xml
index d27a28e..e109687 100644
--- a/contexthub/hidl/host/AndroidTest.xml
+++ b/contexthub/V1_0/host/AndroidTest.xml
@@ -24,7 +24,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="ContexthubHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/contexthub/hidl/host/ContexthubHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/contexthub/V1_0/host/ContexthubHidlTest" />
</test>
</configuration>
diff --git a/contexthub/hidl/host/ContexthubHidlTest.py b/contexthub/V1_0/host/ContexthubHidlTest.py
similarity index 100%
rename from contexthub/hidl/host/ContexthubHidlTest.py
rename to contexthub/V1_0/host/ContexthubHidlTest.py
diff --git a/contexthub/hidl/host/__init__.py b/contexthub/V1_0/host/__init__.py
similarity index 100%
rename from contexthub/hidl/host/__init__.py
rename to contexthub/V1_0/host/__init__.py
diff --git a/contexthub/hidl/target/Android.mk b/contexthub/V1_0/target/Android.mk
similarity index 92%
rename from contexthub/hidl/target/Android.mk
rename to contexthub/V1_0/target/Android.mk
index a46a0e6..c8cf905 100644
--- a/contexthub/hidl/target/Android.mk
+++ b/contexthub/V1_0/target/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := ContexthubHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/contexthub/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/contexthub/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/contexthub/hidl/target/AndroidTest.xml b/contexthub/V1_0/target/AndroidTest.xml
similarity index 100%
rename from contexthub/hidl/target/AndroidTest.xml
rename to contexthub/V1_0/target/AndroidTest.xml
diff --git a/contexthub/hidl/Android.mk b/contexthub/hidl/Android.mk
deleted file mode 100644
index 0c4c55d..0000000
--- a/contexthub/hidl/Android.mk
+++ /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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/gatekeeper/hidl/target/Android.mk b/gatekeeper/V1_0/target/Android.mk
similarity index 92%
rename from gatekeeper/hidl/target/Android.mk
rename to gatekeeper/V1_0/target/Android.mk
index 59bfe17..503c3f5 100644
--- a/gatekeeper/hidl/target/Android.mk
+++ b/gatekeeper/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalGatekeeperHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/gatekeeper/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/gatekeeper/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/gatekeeper/hidl/target/AndroidTest.xml b/gatekeeper/V1_0/target/AndroidTest.xml
similarity index 100%
rename from gatekeeper/hidl/target/AndroidTest.xml
rename to gatekeeper/V1_0/target/AndroidTest.xml
diff --git a/gatekeeper/hidl/target_profiling/Android.mk b/gatekeeper/V1_0/target_profiling/Android.mk
similarity index 92%
rename from gatekeeper/hidl/target_profiling/Android.mk
rename to gatekeeper/V1_0/target_profiling/Android.mk
index 384b33c..8a00bea 100644
--- a/gatekeeper/hidl/target_profiling/Android.mk
+++ b/gatekeeper/V1_0/target_profiling/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalGatekeeperHidlTargetBasicProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/gatekeeper/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/gatekeeper/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/gatekeeper/hidl/target_profiling/AndroidTest.xml b/gatekeeper/V1_0/target_profiling/AndroidTest.xml
similarity index 100%
rename from gatekeeper/hidl/target_profiling/AndroidTest.xml
rename to gatekeeper/V1_0/target_profiling/AndroidTest.xml
diff --git a/gatekeeper/hidl/Android.mk b/gatekeeper/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/gatekeeper/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/graphics/allocator/hidl/target/Android.mk b/graphics/allocator/V2_0/target/Android.mk
similarity index 92%
rename from graphics/allocator/hidl/target/Android.mk
rename to graphics/allocator/V2_0/target/Android.mk
index 2c1617f..41ccad2 100644
--- a/graphics/allocator/hidl/target/Android.mk
+++ b/graphics/allocator/V2_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalGraphicsAllocatorHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/graphics/allocator/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/graphics/allocator/V2_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/graphics/allocator/hidl/target/AndroidTest.xml b/graphics/allocator/V2_0/target/AndroidTest.xml
similarity index 100%
rename from graphics/allocator/hidl/target/AndroidTest.xml
rename to graphics/allocator/V2_0/target/AndroidTest.xml
diff --git a/graphics/allocator/hidl/Android.mk b/graphics/allocator/hidl/Android.mk
deleted file mode 100644
index 0c4c55d..0000000
--- a/graphics/allocator/hidl/Android.mk
+++ /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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/graphics/composer/hidl/target/Android.mk b/graphics/composer/V2_1/target/Android.mk
similarity index 92%
rename from graphics/composer/hidl/target/Android.mk
rename to graphics/composer/V2_1/target/Android.mk
index bafb67f..7cdf5a3 100644
--- a/graphics/composer/hidl/target/Android.mk
+++ b/graphics/composer/V2_1/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalGraphicsComposerHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/graphics/composer/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/graphics/composer/V2_1/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/graphics/composer/hidl/target/AndroidTest.xml b/graphics/composer/V2_1/target/AndroidTest.xml
similarity index 100%
rename from graphics/composer/hidl/target/AndroidTest.xml
rename to graphics/composer/V2_1/target/AndroidTest.xml
diff --git a/graphics/composer/hidl/Android.mk b/graphics/composer/hidl/Android.mk
deleted file mode 100644
index 0c4c55d..0000000
--- a/graphics/composer/hidl/Android.mk
+++ /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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/graphics/mapper/hidl/target/Android.mk b/graphics/mapper/V2_0/target/Android.mk
similarity index 92%
rename from graphics/mapper/hidl/target/Android.mk
rename to graphics/mapper/V2_0/target/Android.mk
index 5f7fae8..6bc0c03 100644
--- a/graphics/mapper/hidl/target/Android.mk
+++ b/graphics/mapper/V2_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalGraphicsMapperHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/graphics/mapper/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/graphics/mapper/V2_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/graphics/mapper/hidl/target/AndroidTest.xml b/graphics/mapper/V2_0/target/AndroidTest.xml
similarity index 100%
rename from graphics/mapper/hidl/target/AndroidTest.xml
rename to graphics/mapper/V2_0/target/AndroidTest.xml
diff --git a/graphics/mapper/hidl/Android.mk b/graphics/mapper/hidl/Android.mk
deleted file mode 100644
index 0c4c55d..0000000
--- a/graphics/mapper/hidl/Android.mk
+++ /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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
diff --git a/light/hidl/target/Android.mk b/light/V2_0/target/Android.mk
similarity index 93%
rename from light/hidl/target/Android.mk
rename to light/V2_0/target/Android.mk
index 4761a3e..e58d2c6 100644
--- a/light/hidl/target/Android.mk
+++ b/light/V2_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := LightHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/light/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/light/V2_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/light/hidl/target/AndroidTest.xml b/light/V2_0/target/AndroidTest.xml
similarity index 99%
rename from light/hidl/target/AndroidTest.xml
rename to light/V2_0/target/AndroidTest.xml
index 240f1f0..9c3e944 100644
--- a/light/hidl/target/AndroidTest.xml
+++ b/light/V2_0/target/AndroidTest.xml
@@ -28,4 +28,3 @@
<option name="test-timeout" value="1m" />
</test>
</configuration>
-
diff --git a/light/hidl/target_profiling/Android.mk b/light/V2_0/target_profiling/Android.mk
similarity index 92%
rename from light/hidl/target_profiling/Android.mk
rename to light/V2_0/target_profiling/Android.mk
index 939929d..b5ae8b7 100644
--- a/light/hidl/target_profiling/Android.mk
+++ b/light/V2_0/target_profiling/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := LightHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/light/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/light/V2_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/light/hidl/target_profiling/AndroidTest.xml b/light/V2_0/target_profiling/AndroidTest.xml
similarity index 99%
rename from light/hidl/target_profiling/AndroidTest.xml
rename to light/V2_0/target_profiling/AndroidTest.xml
index 455802d..a71664c 100644
--- a/light/hidl/target_profiling/AndroidTest.xml
+++ b/light/V2_0/target_profiling/AndroidTest.xml
@@ -29,4 +29,3 @@
<option name="enable-profiling" value="true" />
</test>
</configuration>
-
diff --git a/light/hidl/Android.mk b/light/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/light/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/memtrack/hidl/target/Android.mk b/memtrack/V1_0/target/Android.mk
similarity index 93%
rename from memtrack/hidl/target/Android.mk
rename to memtrack/V1_0/target/Android.mk
index 8dcaabb..c564c0d 100644
--- a/memtrack/hidl/target/Android.mk
+++ b/memtrack/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalMemtrackHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/memtrack/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/memtrack/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/memtrack/hidl/target/AndroidTest.xml b/memtrack/V1_0/target/AndroidTest.xml
similarity index 100%
rename from memtrack/hidl/target/AndroidTest.xml
rename to memtrack/V1_0/target/AndroidTest.xml
diff --git a/memtrack/hidl/target_profiling/Android.mk b/memtrack/V1_0/target_profiling/Android.mk
similarity index 92%
rename from memtrack/hidl/target_profiling/Android.mk
rename to memtrack/V1_0/target_profiling/Android.mk
index d397621..b9b13b6 100644
--- a/memtrack/hidl/target_profiling/Android.mk
+++ b/memtrack/V1_0/target_profiling/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalMemtrackHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/memtrack/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/memtrack/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/memtrack/hidl/target_profiling/AndroidTest.xml b/memtrack/V1_0/target_profiling/AndroidTest.xml
similarity index 100%
rename from memtrack/hidl/target_profiling/AndroidTest.xml
rename to memtrack/V1_0/target_profiling/AndroidTest.xml
diff --git a/memtrack/hidl/Android.mk b/memtrack/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/memtrack/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/V1_0/host/binderize/Android.mk b/nfc/V1_0/host/binderize/Android.mk
index 3e86275..9ef5ad1 100644
--- a/nfc/V1_0/host/binderize/Android.mk
+++ b/nfc/V1_0/host/binderize/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := NfcHidlBinderizeBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/nfc/V1_0/hidl/host/binderize
+VTS_CONFIG_SRC_DIR := testcases/hal/nfc/V1_0/host/binderize
include test/vts/tools/build/Android.host_config.mk
diff --git a/nfc/V1_0/target_profiling/Android.mk b/nfc/V1_0/target_profiling/Android.mk
index c7bf853..d46139d 100644
--- a/nfc/V1_0/target_profiling/Android.mk
+++ b/nfc/V1_0/target_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := NfcHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/nfc/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/nfc/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/power/hidl/target/Android.mk b/power/V1_0/target/Android.mk
similarity index 93%
rename from power/hidl/target/Android.mk
rename to power/V1_0/target/Android.mk
index c66b6fb..2fb8dfc 100644
--- a/power/hidl/target/Android.mk
+++ b/power/V1_0/target/Android.mk
@@ -21,6 +21,6 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalPowerHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/power/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/power/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/power/hidl/target/AndroidTest.xml b/power/V1_0/target/AndroidTest.xml
similarity index 100%
rename from power/hidl/target/AndroidTest.xml
rename to power/V1_0/target/AndroidTest.xml
diff --git a/power/hidl/target_profiling/Android.mk b/power/V1_0/target_profiling/Android.mk
similarity index 92%
rename from power/hidl/target_profiling/Android.mk
rename to power/V1_0/target_profiling/Android.mk
index 6f9e399..0ca4bd8 100644
--- a/power/hidl/target_profiling/Android.mk
+++ b/power/V1_0/target_profiling/Android.mk
@@ -21,6 +21,6 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalPowerHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/power/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/power/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/power/hidl/target_profiling/AndroidTest.xml b/power/V1_0/target_profiling/AndroidTest.xml
similarity index 100%
rename from power/hidl/target_profiling/AndroidTest.xml
rename to power/V1_0/target_profiling/AndroidTest.xml
diff --git a/power/hidl/Android.mk b/power/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/power/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/radio/hidl/__init__.py b/radio/V1_0/__init__.py
similarity index 100%
rename from radio/hidl/__init__.py
rename to radio/V1_0/__init__.py
diff --git a/radio/hidl/host/Android.mk b/radio/V1_0/host/Android.mk
similarity index 93%
rename from radio/hidl/host/Android.mk
rename to radio/V1_0/host/Android.mk
index 59f7c85..328f199 100644
--- a/radio/hidl/host/Android.mk
+++ b/radio/V1_0/host/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := RadioHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/radio/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/radio/V1_0/host
include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/radio/hidl/host/AndroidTest.xml b/radio/V1_0/host/AndroidTest.xml
similarity index 98%
rename from radio/hidl/host/AndroidTest.xml
rename to radio/V1_0/host/AndroidTest.xml
index a826d20..1a9bff1 100644
--- a/radio/hidl/host/AndroidTest.xml
+++ b/radio/V1_0/host/AndroidTest.xml
@@ -27,6 +27,6 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="RadioHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/radio/hidl/host/RadioHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/radio/V1_0/host/RadioHidlTest" />
</test>
</configuration>
diff --git a/radio/hidl/host/RadioHidlTest.py b/radio/V1_0/host/RadioHidlTest.py
similarity index 100%
rename from radio/hidl/host/RadioHidlTest.py
rename to radio/V1_0/host/RadioHidlTest.py
diff --git a/radio/hidl/host/__init__.py b/radio/V1_0/host/__init__.py
similarity index 100%
rename from radio/hidl/host/__init__.py
rename to radio/V1_0/host/__init__.py
diff --git a/radio/hidl/Android.mk b/radio/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/radio/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/sensors/hidl/__init__.py b/sensors/V1_0/__init__.py
similarity index 100%
rename from sensors/hidl/__init__.py
rename to sensors/V1_0/__init__.py
diff --git a/sensors/hidl/host/Android.mk b/sensors/V1_0/host/Android.mk
similarity index 92%
rename from sensors/hidl/host/Android.mk
rename to sensors/V1_0/host/Android.mk
index 79f8f7a..f5288df 100644
--- a/sensors/hidl/host/Android.mk
+++ b/sensors/V1_0/host/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := SensorsHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/sensors/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/sensors/V1_0/host
include test/vts/tools/build/Android.host_config.mk
diff --git a/sensors/hidl/host/AndroidTest.xml b/sensors/V1_0/host/AndroidTest.xml
similarity index 97%
rename from sensors/hidl/host/AndroidTest.xml
rename to sensors/V1_0/host/AndroidTest.xml
index 6e40610..ce2f0e9 100644
--- a/sensors/hidl/host/AndroidTest.xml
+++ b/sensors/V1_0/host/AndroidTest.xml
@@ -23,7 +23,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="SensorsHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/sensors/hidl/host/SensorsHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/sensors/V1_0/host/SensorsHidlTest" />
<option name="test-timeout" value="3m" />
</test>
</configuration>
diff --git a/sensors/hidl/host/SensorsHidlTest.py b/sensors/V1_0/host/SensorsHidlTest.py
similarity index 100%
rename from sensors/hidl/host/SensorsHidlTest.py
rename to sensors/V1_0/host/SensorsHidlTest.py
diff --git a/sensors/hidl/host/__init__.py b/sensors/V1_0/host/__init__.py
similarity index 100%
rename from sensors/hidl/host/__init__.py
rename to sensors/V1_0/host/__init__.py
diff --git a/sensors/hidl/host_profiling/Android.mk b/sensors/V1_0/host_profiling/Android.mk
similarity index 91%
rename from sensors/hidl/host_profiling/Android.mk
rename to sensors/V1_0/host_profiling/Android.mk
index 6029cc0..2ca9e99 100644
--- a/sensors/hidl/host_profiling/Android.mk
+++ b/sensors/V1_0/host_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := SensorsHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/sensors/hidl/host_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/sensors/V1_0/host_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/sensors/hidl/host_profiling/AndroidTest.xml b/sensors/V1_0/host_profiling/AndroidTest.xml
similarity index 97%
rename from sensors/hidl/host_profiling/AndroidTest.xml
rename to sensors/V1_0/host_profiling/AndroidTest.xml
index c056d90..a8c89df 100644
--- a/sensors/hidl/host_profiling/AndroidTest.xml
+++ b/sensors/V1_0/host_profiling/AndroidTest.xml
@@ -23,7 +23,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="SensorsHidlProfilingTest" />
- <option name="test-case-path" value="vts/testcases/hal/sensors/hidl/host/SensorsHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/sensors/V1_0/host/SensorsHidlTest" />
<option name="test-timeout" value="3m" />
<option name="enable-profiling" value="true" />
</test>
diff --git a/sensors/hidl/target/Android.mk b/sensors/V1_0/target/Android.mk
similarity index 93%
rename from sensors/hidl/target/Android.mk
rename to sensors/V1_0/target/Android.mk
index c71a661..313a9aa 100644
--- a/sensors/hidl/target/Android.mk
+++ b/sensors/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := SensorsHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/sensors/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/sensors/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/sensors/hidl/target/AndroidTest.xml b/sensors/V1_0/target/AndroidTest.xml
similarity index 100%
rename from sensors/hidl/target/AndroidTest.xml
rename to sensors/V1_0/target/AndroidTest.xml
diff --git a/sensors/hidl/target_profiling/Android.mk b/sensors/V1_0/target_profiling/Android.mk
similarity index 92%
rename from sensors/hidl/target_profiling/Android.mk
rename to sensors/V1_0/target_profiling/Android.mk
index 1b81381..15669ad 100644
--- a/sensors/hidl/target_profiling/Android.mk
+++ b/sensors/V1_0/target_profiling/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := SensorsHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/sensors/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/sensors/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/sensors/hidl/target_profiling/AndroidTest.xml b/sensors/V1_0/target_profiling/AndroidTest.xml
similarity index 100%
rename from sensors/hidl/target_profiling/AndroidTest.xml
rename to sensors/V1_0/target_profiling/AndroidTest.xml
diff --git a/sensors/hidl/Android.mk b/sensors/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/sensors/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/soundtrigger/hidl/target/Android.mk b/soundtrigger/V2_0/target/Android.mk
similarity index 92%
rename from soundtrigger/hidl/target/Android.mk
rename to soundtrigger/V2_0/target/Android.mk
index a99f4ce..6e951af 100644
--- a/soundtrigger/hidl/target/Android.mk
+++ b/soundtrigger/V2_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalSoundTriggerHidlTargetBasicTest
-VTS_CONFIG_SRC_DIR := testcases/hal/soundtrigger/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/soundtrigger/V2_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/soundtrigger/hidl/target/AndroidTest.xml b/soundtrigger/V2_0/target/AndroidTest.xml
similarity index 96%
rename from soundtrigger/hidl/target/AndroidTest.xml
rename to soundtrigger/V2_0/target/AndroidTest.xml
index d450315..2f50441 100644
--- a/soundtrigger/hidl/target/AndroidTest.xml
+++ b/soundtrigger/V2_0/target/AndroidTest.xml
@@ -24,7 +24,7 @@
_32bit::DATA/nativetest/soundtrigger_hidl_hal_test/soundtrigger_hidl_hal_test,
_64bit::DATA/nativetest64/soundtrigger_hidl_hal_test/soundtrigger_hidl_hal_test,
"/>
- <option name="test-config-path" value="vts/testcases/hal/soundtrigger/hidl/target/HalSoundTriggerHidlTargetBasicTest.config" />
+ <option name="test-config-path" value="vts/testcases/hal/soundtrigger/V2_0/target/HalSoundTriggerHidlTargetBasicTest.config" />
<option name="binary-test-type" value="hal_hidl_gtest" />
<option name="precondition-file-path-prefix" value="/*/lib/hw/sound_trigger.primary." />
<option name="skip-on-64bit-abi" value="true" />
diff --git a/soundtrigger/hidl/target/HalSoundTriggerHidlTargetBasicTest.config b/soundtrigger/V2_0/target/HalSoundTriggerHidlTargetBasicTest.config
similarity index 100%
rename from soundtrigger/hidl/target/HalSoundTriggerHidlTargetBasicTest.config
rename to soundtrigger/V2_0/target/HalSoundTriggerHidlTargetBasicTest.config
diff --git a/soundtrigger/hidl/target_profiling/Android.mk b/soundtrigger/V2_0/target_profiling/Android.mk
similarity index 92%
rename from soundtrigger/hidl/target_profiling/Android.mk
rename to soundtrigger/V2_0/target_profiling/Android.mk
index fc0f9c4..2f6e172 100644
--- a/soundtrigger/hidl/target_profiling/Android.mk
+++ b/soundtrigger/V2_0/target_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalSoundTriggerHidlTargetBasicProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/soundtrigger/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/soundtrigger/V2_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/soundtrigger/hidl/target_profiling/AndroidTest.xml b/soundtrigger/V2_0/target_profiling/AndroidTest.xml
similarity index 100%
rename from soundtrigger/hidl/target_profiling/AndroidTest.xml
rename to soundtrigger/V2_0/target_profiling/AndroidTest.xml
diff --git a/soundtrigger/hidl/Android.mk b/soundtrigger/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/soundtrigger/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/hidl/target/Android.mk b/thermal/V1_0/target/Android.mk
similarity index 93%
rename from thermal/hidl/target/Android.mk
rename to thermal/V1_0/target/Android.mk
index 1c3ceb3..0464800 100644
--- a/thermal/hidl/target/Android.mk
+++ b/thermal/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := ThermalHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/thermal/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/thermal/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/thermal/hidl/target/AndroidTest.xml b/thermal/V1_0/target/AndroidTest.xml
similarity index 99%
rename from thermal/hidl/target/AndroidTest.xml
rename to thermal/V1_0/target/AndroidTest.xml
index 169264d..2078eb6 100644
--- a/thermal/hidl/target/AndroidTest.xml
+++ b/thermal/V1_0/target/AndroidTest.xml
@@ -28,4 +28,3 @@
<option name="test-timeout" value="5m" />
</test>
</configuration>
-
diff --git a/thermal/hidl/target_profiling/Android.mk b/thermal/V1_0/target_profiling/Android.mk
similarity index 92%
rename from thermal/hidl/target_profiling/Android.mk
rename to thermal/V1_0/target_profiling/Android.mk
index 1f937fa..9d9f856 100644
--- a/thermal/hidl/target_profiling/Android.mk
+++ b/thermal/V1_0/target_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := ThermalHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/thermal/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/thermal/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/thermal/hidl/target_profiling/AndroidTest.xml b/thermal/V1_0/target_profiling/AndroidTest.xml
similarity index 100%
rename from thermal/hidl/target_profiling/AndroidTest.xml
rename to thermal/V1_0/target_profiling/AndroidTest.xml
diff --git a/thermal/hidl/Android.mk b/thermal/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/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/tv_cec/__init__.py b/tv/__init__.py
similarity index 100%
copy from tv_cec/__init__.py
copy to tv/__init__.py
diff --git a/tv_cec/__init__.py b/tv/cec/V1_0/__init__.py
similarity index 100%
copy from tv_cec/__init__.py
copy to tv/cec/V1_0/__init__.py
diff --git a/tv_cec/hidl/host/Android.mk b/tv/cec/V1_0/host/Android.mk
similarity index 92%
rename from tv_cec/hidl/host/Android.mk
rename to tv/cec/V1_0/host/Android.mk
index 14a57a6..cb6bf2c 100644
--- a/tv_cec/hidl/host/Android.mk
+++ b/tv/cec/V1_0/host/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := TvCecHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_cec/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/tv_cec/V1_0/host
include test/vts/tools/build/Android.host_config.mk
diff --git a/tv_cec/hidl/host/AndroidTest.xml b/tv/cec/V1_0/host/AndroidTest.xml
similarity index 97%
rename from tv_cec/hidl/host/AndroidTest.xml
rename to tv/cec/V1_0/host/AndroidTest.xml
index 79584d5..5cd3db5 100644
--- a/tv_cec/hidl/host/AndroidTest.xml
+++ b/tv/cec/V1_0/host/AndroidTest.xml
@@ -25,6 +25,6 @@
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="TvCecHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/tv_cec/V1_0/host/TvCecHidlTest" />
</test>
</configuration>
\ No newline at end of file
diff --git a/tv_cec/hidl/host/TvCecHidlTest.py b/tv/cec/V1_0/host/TvCecHidlTest.py
similarity index 100%
rename from tv_cec/hidl/host/TvCecHidlTest.py
rename to tv/cec/V1_0/host/TvCecHidlTest.py
diff --git a/tv_cec/hidl/host/__init__.py b/tv/cec/V1_0/host/__init__.py
similarity index 100%
rename from tv_cec/hidl/host/__init__.py
rename to tv/cec/V1_0/host/__init__.py
diff --git a/tv_cec/hidl/host_profiling/Android.mk b/tv/cec/V1_0/host_profiling/Android.mk
similarity index 91%
rename from tv_cec/hidl/host_profiling/Android.mk
rename to tv/cec/V1_0/host_profiling/Android.mk
index 40536a5..1d1cce6 100644
--- a/tv_cec/hidl/host_profiling/Android.mk
+++ b/tv/cec/V1_0/host_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := TvCecHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_cec/hidl/host_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/tv_cec/V1_0/host_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/tv_cec/hidl/host_profiling/AndroidTest.xml b/tv/cec/V1_0/host_profiling/AndroidTest.xml
similarity index 97%
rename from tv_cec/hidl/host_profiling/AndroidTest.xml
rename to tv/cec/V1_0/host_profiling/AndroidTest.xml
index ffd857e..1c9a4cb 100644
--- a/tv_cec/hidl/host_profiling/AndroidTest.xml
+++ b/tv/cec/V1_0/host_profiling/AndroidTest.xml
@@ -25,7 +25,7 @@
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="TvCecHidlProfilingTest" />
- <option name="test-case-path" value="vts/testcases/hal/tv_cec/hidl/host/TvCecHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/tv_cec/V1_0/host/TvCecHidlTest" />
<option name="enable-profiling" value="true" />
</test>
</configuration>
\ No newline at end of file
diff --git a/tv_cec/__init__.py b/tv/cec/__init__.py
similarity index 100%
rename from tv_cec/__init__.py
rename to tv/cec/__init__.py
diff --git a/tv_cec/__init__.py b/tv/input/V1_0/__init__.py
similarity index 100%
copy from tv_cec/__init__.py
copy to tv/input/V1_0/__init__.py
diff --git a/tv_input/hidl/host/Android.mk b/tv/input/V1_0/host/Android.mk
similarity index 92%
rename from tv_input/hidl/host/Android.mk
rename to tv/input/V1_0/host/Android.mk
index 1757bfe..3ea66f5 100644
--- a/tv_input/hidl/host/Android.mk
+++ b/tv/input/V1_0/host/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := TvInputHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_input/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/tv/input/V1_0/host
include test/vts/tools/build/Android.host_config.mk
diff --git a/tv_input/hidl/host/AndroidTest.xml b/tv/input/V1_0/host/AndroidTest.xml
similarity index 97%
rename from tv_input/hidl/host/AndroidTest.xml
rename to tv/input/V1_0/host/AndroidTest.xml
index 8fdd72d..dd2c6d2 100644
--- a/tv_input/hidl/host/AndroidTest.xml
+++ b/tv/input/V1_0/host/AndroidTest.xml
@@ -25,6 +25,6 @@
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="TvInputHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/tv/input/V1_0/host/TvInputHidlTest" />
</test>
</configuration>
diff --git a/tv_input/hidl/host/TvInputHidlTest.py b/tv/input/V1_0/host/TvInputHidlTest.py
similarity index 100%
rename from tv_input/hidl/host/TvInputHidlTest.py
rename to tv/input/V1_0/host/TvInputHidlTest.py
diff --git a/tv_cec/hidl/host/__init__.py b/tv/input/V1_0/host/__init__.py
similarity index 100%
copy from tv_cec/hidl/host/__init__.py
copy to tv/input/V1_0/host/__init__.py
diff --git a/tv_input/hidl/host_profiling/Android.mk b/tv/input/V1_0/host_profiling/Android.mk
similarity index 91%
rename from tv_input/hidl/host_profiling/Android.mk
rename to tv/input/V1_0/host_profiling/Android.mk
index 514df20..c405821 100644
--- a/tv_input/hidl/host_profiling/Android.mk
+++ b/tv/input/V1_0/host_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := TvInputHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_input/hidl/host_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/tv/input/V1_0/host_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/tv_input/hidl/host_profiling/AndroidTest.xml b/tv/input/V1_0/host_profiling/AndroidTest.xml
similarity index 97%
rename from tv_input/hidl/host_profiling/AndroidTest.xml
rename to tv/input/V1_0/host_profiling/AndroidTest.xml
index 5b8e6f9..424db1e 100644
--- a/tv_input/hidl/host_profiling/AndroidTest.xml
+++ b/tv/input/V1_0/host_profiling/AndroidTest.xml
@@ -25,7 +25,7 @@
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="TvInputHidlProfilingTest" />
- <option name="test-case-path" value="vts/testcases/hal/tv_input/hidl/host/TvInputHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/tv/input/V1_0/host/TvInputHidlTest" />
<option name="enable-profiling" value="true" />
</test>
</configuration>
diff --git a/tv_input/hidl/host_profiling/__init__.py b/tv/input/V1_0/host_profiling/__init__.py
similarity index 100%
rename from tv_input/hidl/host_profiling/__init__.py
rename to tv/input/V1_0/host_profiling/__init__.py
diff --git a/tv_input/hidl/target/Android.mk b/tv/input/V1_0/target/Android.mk
similarity index 92%
rename from tv_input/hidl/target/Android.mk
rename to tv/input/V1_0/target/Android.mk
index 153da0b..649fe0d 100644
--- a/tv_input/hidl/target/Android.mk
+++ b/tv/input/V1_0/target/Android.mk
@@ -21,6 +21,6 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalTvInputHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_input/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/tv/input/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/tv_input/hidl/target/AndroidTest.xml b/tv/input/V1_0/target/AndroidTest.xml
similarity index 99%
rename from tv_input/hidl/target/AndroidTest.xml
rename to tv/input/V1_0/target/AndroidTest.xml
index 88adbde..4ef86ef 100644
--- a/tv_input/hidl/target/AndroidTest.xml
+++ b/tv/input/V1_0/target/AndroidTest.xml
@@ -26,4 +26,3 @@
<option name="test-timeout" value="5m" />
</test>
</configuration>
-
diff --git a/tv_input/hidl/target_profiling/Android.mk b/tv/input/V1_0/target_profiling/Android.mk
similarity index 92%
rename from tv_input/hidl/target_profiling/Android.mk
rename to tv/input/V1_0/target_profiling/Android.mk
index 7acbd19..5e5fb66 100644
--- a/tv_input/hidl/target_profiling/Android.mk
+++ b/tv/input/V1_0/target_profiling/Android.mk
@@ -21,6 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := HalTvInputHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/tv_input/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/tv/input/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
-
diff --git a/tv_input/hidl/target_profiling/AndroidTest.xml b/tv/input/V1_0/target_profiling/AndroidTest.xml
similarity index 99%
rename from tv_input/hidl/target_profiling/AndroidTest.xml
rename to tv/input/V1_0/target_profiling/AndroidTest.xml
index d7063ad..7c764c3 100644
--- a/tv_input/hidl/target_profiling/AndroidTest.xml
+++ b/tv/input/V1_0/target_profiling/AndroidTest.xml
@@ -27,4 +27,3 @@
<option name="enable-profiling" value="true" />
</test>
</configuration>
-
diff --git a/tv_input/__init__.py b/tv/input/__init__.py
similarity index 100%
rename from tv_input/__init__.py
rename to tv/input/__init__.py
diff --git a/tv_cec/hidl/Android.mk b/tv_cec/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/tv_cec/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/tv_cec/hidl/__init__.py b/tv_cec/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv_cec/hidl/__init__.py
+++ /dev/null
diff --git a/tv_input/hidl/Android.mk b/tv_input/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/tv_input/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/tv_input/hidl/__init__.py b/tv_input/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv_input/hidl/__init__.py
+++ /dev/null
diff --git a/tv_input/hidl/host/__init__.py b/tv_input/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tv_input/hidl/host/__init__.py
+++ /dev/null
diff --git a/vehicle/hidl/Android.mk b/vehicle/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/vehicle/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/vehicle/hidl/__init__.py b/vehicle/hidl/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vehicle/hidl/__init__.py
+++ /dev/null
diff --git a/vehicle/hidl/host/__init__.py b/vehicle/hidl/host/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/vehicle/hidl/host/__init__.py
+++ /dev/null
diff --git a/vibrator/hidl/__init__.py b/vibrator/V1_0/__init__.py
similarity index 100%
rename from vibrator/hidl/__init__.py
rename to vibrator/V1_0/__init__.py
diff --git a/vibrator/hidl/host/Android.mk b/vibrator/V1_0/host/Android.mk
similarity index 92%
rename from vibrator/hidl/host/Android.mk
rename to vibrator/V1_0/host/Android.mk
index d005450..972fd33 100644
--- a/vibrator/hidl/host/Android.mk
+++ b/vibrator/V1_0/host/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := VibratorHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/V1_0/host
include test/vts/tools/build/Android.host_config.mk
\ No newline at end of file
diff --git a/vibrator/hidl/host/AndroidTest.xml b/vibrator/V1_0/host/AndroidTest.xml
similarity index 97%
rename from vibrator/hidl/host/AndroidTest.xml
rename to vibrator/V1_0/host/AndroidTest.xml
index c5074ee..f69e4d6 100644
--- a/vibrator/hidl/host/AndroidTest.xml
+++ b/vibrator/V1_0/host/AndroidTest.xml
@@ -23,6 +23,6 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VibratorHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/vibrator/V1_0/host/VibratorHidlTest" />
</test>
</configuration>
diff --git a/vibrator/hidl/host/VibratorHidlTest.py b/vibrator/V1_0/host/VibratorHidlTest.py
similarity index 100%
rename from vibrator/hidl/host/VibratorHidlTest.py
rename to vibrator/V1_0/host/VibratorHidlTest.py
diff --git a/vibrator/hidl/host/__init__.py b/vibrator/V1_0/host/__init__.py
similarity index 100%
rename from vibrator/hidl/host/__init__.py
rename to vibrator/V1_0/host/__init__.py
diff --git a/vibrator/hidl/host_profiling/Android.mk b/vibrator/V1_0/host_profiling/Android.mk
similarity index 91%
rename from vibrator/hidl/host_profiling/Android.mk
rename to vibrator/V1_0/host_profiling/Android.mk
index ec73e06..84e1d37 100644
--- a/vibrator/hidl/host_profiling/Android.mk
+++ b/vibrator/V1_0/host_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := VibratorHidlProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/host_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/V1_0/host_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/hidl/host_profiling/AndroidTest.xml b/vibrator/V1_0/host_profiling/AndroidTest.xml
similarity index 97%
rename from vibrator/hidl/host_profiling/AndroidTest.xml
rename to vibrator/V1_0/host_profiling/AndroidTest.xml
index 54830f0..d808c96 100644
--- a/vibrator/hidl/host_profiling/AndroidTest.xml
+++ b/vibrator/V1_0/host_profiling/AndroidTest.xml
@@ -23,7 +23,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VibratorHidlProfilingTest" />
- <option name="test-case-path" value="vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/vibrator/V1_0/host/VibratorHidlTest" />
<option name="enable-profiling" value="true" />
</test>
</configuration>
diff --git a/vibrator/hidl/target/Android.mk b/vibrator/V1_0/target/Android.mk
similarity index 93%
rename from vibrator/hidl/target/Android.mk
rename to vibrator/V1_0/target/Android.mk
index 704d985..a2dd029 100644
--- a/vibrator/hidl/target/Android.mk
+++ b/vibrator/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := VibratorHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/hidl/target/AndroidTest.xml b/vibrator/V1_0/target/AndroidTest.xml
similarity index 99%
rename from vibrator/hidl/target/AndroidTest.xml
rename to vibrator/V1_0/target/AndroidTest.xml
index 7948c86..8af9467 100644
--- a/vibrator/hidl/target/AndroidTest.xml
+++ b/vibrator/V1_0/target/AndroidTest.xml
@@ -28,4 +28,3 @@
<option name="test-timeout" value="1m" />
</test>
</configuration>
-
diff --git a/vibrator/hidl/target_profiling/Android.mk b/vibrator/V1_0/target_profiling/Android.mk
similarity index 92%
rename from vibrator/hidl/target_profiling/Android.mk
rename to vibrator/V1_0/target_profiling/Android.mk
index a1f43e4..acddc13 100644
--- a/vibrator/hidl/target_profiling/Android.mk
+++ b/vibrator/V1_0/target_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := VibratorHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/vibrator/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/vibrator/hidl/target_profiling/AndroidTest.xml b/vibrator/V1_0/target_profiling/AndroidTest.xml
similarity index 99%
rename from vibrator/hidl/target_profiling/AndroidTest.xml
rename to vibrator/V1_0/target_profiling/AndroidTest.xml
index 4643e23..5256f73 100644
--- a/vibrator/hidl/target_profiling/AndroidTest.xml
+++ b/vibrator/V1_0/target_profiling/AndroidTest.xml
@@ -29,4 +29,3 @@
<option name="enable-profiling" value="true" />
</test>
</configuration>
-
diff --git a/vibrator/hidl/Android.mk b/vibrator/hidl/Android.mk
deleted file mode 100644
index f9e3276..0000000
--- a/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/vr/hidl/__init__.py b/vr/V1_0/__init__.py
similarity index 100%
rename from vr/hidl/__init__.py
rename to vr/V1_0/__init__.py
diff --git a/vr/hidl/host/Android.mk b/vr/V1_0/host/Android.mk
similarity index 93%
rename from vr/hidl/host/Android.mk
rename to vr/V1_0/host/Android.mk
index 9388b8d..dc2843d 100644
--- a/vr/hidl/host/Android.mk
+++ b/vr/V1_0/host/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := VrHidlTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vr/hidl/host
+VTS_CONFIG_SRC_DIR := testcases/hal/vr/V1_0/host
include test/vts/tools/build/Android.host_config.mk
diff --git a/vr/hidl/host/AndroidTest.xml b/vr/V1_0/host/AndroidTest.xml
similarity index 97%
rename from vr/hidl/host/AndroidTest.xml
rename to vr/V1_0/host/AndroidTest.xml
index 1cd2a80..d34b478 100644
--- a/vr/hidl/host/AndroidTest.xml
+++ b/vr/V1_0/host/AndroidTest.xml
@@ -22,6 +22,6 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VrHidlTest" />
- <option name="test-case-path" value="vts/testcases/hal/vr/hidl/host/VrHidlTest" />
+ <option name="test-case-path" value="vts/testcases/hal/vr/V1_0/host/VrHidlTest" />
</test>
</configuration>
diff --git a/vr/hidl/host/VrHidlTest.py b/vr/V1_0/host/VrHidlTest.py
similarity index 100%
rename from vr/hidl/host/VrHidlTest.py
rename to vr/V1_0/host/VrHidlTest.py
diff --git a/vr/hidl/host/__init__.py b/vr/V1_0/host/__init__.py
similarity index 100%
rename from vr/hidl/host/__init__.py
rename to vr/V1_0/host/__init__.py
diff --git a/vr/hidl/target/Android.mk b/vr/V1_0/target/Android.mk
similarity index 93%
rename from vr/hidl/target/Android.mk
rename to vr/V1_0/target/Android.mk
index 691d1a4..a2aebfc 100644
--- a/vr/hidl/target/Android.mk
+++ b/vr/V1_0/target/Android.mk
@@ -21,5 +21,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := VrHidlTargetTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vr/hidl/target
+VTS_CONFIG_SRC_DIR := testcases/hal/vr/V1_0/target
include test/vts/tools/build/Android.host_config.mk
diff --git a/vr/hidl/target/AndroidTest.xml b/vr/V1_0/target/AndroidTest.xml
similarity index 97%
rename from vr/hidl/target/AndroidTest.xml
rename to vr/V1_0/target/AndroidTest.xml
index 8c7a9b7..df3b2f9 100644
--- a/vr/hidl/target/AndroidTest.xml
+++ b/vr/V1_0/target/AndroidTest.xml
@@ -30,6 +30,6 @@
<option name="precondition-hwbinder-service" value="android.hardware.vr" /> -->
<option name="precondition-feature" value="android.hardware.vr.high_performance" />
<option name="test-timeout" value="1m" />
- <option name="test-config-path" value="vts/testcases/hal/vr/hidl/target/VrHidlTargetTest.config" />
+ <option name="test-config-path" value="vts/testcases/hal/vr/V1_0/target/VrHidlTargetTest.config" />
</test>
</configuration>
diff --git a/vr/hidl/target/VrHidlTargetTest.config b/vr/V1_0/target/VrHidlTargetTest.config
similarity index 100%
rename from vr/hidl/target/VrHidlTargetTest.config
rename to vr/V1_0/target/VrHidlTargetTest.config
diff --git a/vr/hidl/target_profiling/Android.mk b/vr/V1_0/target_profiling/Android.mk
similarity index 92%
rename from vr/hidl/target_profiling/Android.mk
rename to vr/V1_0/target_profiling/Android.mk
index 6f60af3..05d89b5 100644
--- a/vr/hidl/target_profiling/Android.mk
+++ b/vr/V1_0/target_profiling/Android.mk
@@ -19,5 +19,5 @@
include $(CLEAR_VARS)
LOCAL_MODULE := VrHidlTargetProfilingTest
-VTS_CONFIG_SRC_DIR := testcases/hal/vr/hidl/target_profiling
+VTS_CONFIG_SRC_DIR := testcases/hal/vr/V1_0/target_profiling
include test/vts/tools/build/Android.host_config.mk
diff --git a/vr/hidl/target_profiling/AndroidTest.xml b/vr/V1_0/target_profiling/AndroidTest.xml
similarity index 99%
rename from vr/hidl/target_profiling/AndroidTest.xml
rename to vr/V1_0/target_profiling/AndroidTest.xml
index 3bc711a..10c9611 100644
--- a/vr/hidl/target_profiling/AndroidTest.xml
+++ b/vr/V1_0/target_profiling/AndroidTest.xml
@@ -29,4 +29,3 @@
<option name="enable-profiling" value="true" />
</test>
</configuration>
-
diff --git a/vr/hidl/Android.mk b/vr/hidl/Android.mk
deleted file mode 100644
index 0c4c55d..0000000
--- a/vr/hidl/Android.mk
+++ /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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)