DO NOT MERGE regenerate bp files for Camera 3.3 am: c6a1e863d6
am: 2470a68107 -s ours
Change-Id: I822f0e7151d9119bd8d432a3d31674a699411071
diff --git a/audio/OWNERS b/audio/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/audio/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/audio/V2_0/target/AndroidTest.xml b/audio/V2_0/target/AndroidTest.xml
index f71ca47..a54f8b1 100644
--- a/audio/V2_0/target/AndroidTest.xml
+++ b/audio/V2_0/target/AndroidTest.xml
@@ -28,7 +28,7 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.audio@2.0"/>
- <option name="test-timeout" value="60m"/>
- <option name="runtime-hint" value="10m"/>
+ <option name="test-timeout" value="30m"/>
+ <option name="gtest-batch-mode" value="true"/>
</test>
</configuration>
diff --git a/audio/V2_0/target_profiling/AndroidTest.xml b/audio/V2_0/target_profiling/AndroidTest.xml
index 3655a90..df9f0aa 100644
--- a/audio/V2_0/target_profiling/AndroidTest.xml
+++ b/audio/V2_0/target_profiling/AndroidTest.xml
@@ -34,6 +34,7 @@
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="precondition-lshal" value="android.hardware.audio@2.0"/>
- <option name="test-timeout" value="120m"/>
+ <option name="test-timeout" value="60m"/>
+ <option name="gtest-batch-mode" value="true"/>
</test>
</configuration>
diff --git a/bluetooth/V1_0/app/Android.mk b/bluetooth/V1_0/app/Android.mk
new file mode 100644
index 0000000..32c4fdc
--- /dev/null
+++ b/bluetooth/V1_0/app/Android.mk
@@ -0,0 +1,24 @@
+#
+# 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 $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsAppBluetooth
+VTS_CONFIG_SRC_DIR := testcases/hal/bluetooth/V1_0/app
+include test/vts/tools/build/Android.host_config.mk
+
diff --git a/bluetooth/V1_0/app/AndroidTest.xml b/bluetooth/V1_0/app/AndroidTest.xml
new file mode 100644
index 0000000..9553d02
--- /dev/null
+++ b/bluetooth/V1_0/app/AndroidTest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Config for VTS VtsAppBluetooth test cases">
+ <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+ <option name="no-dep-module" value="enum" />
+ <option name="dep-module" value="enum34" />
+ <option name="dep-module" value="pyserial" />
+ <option name="dep-module" value="shellescape" />
+ <option name="dep-module" value="statistics" />
+ <option name="dep-module" value="subprocess32" />
+ </multi_target_preparer>
+
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsAppBluetooth"/>
+ <option name="test-case-path" value="vts/testcases/acts/bt/BtAirplaneModeTest"/>
+ <option name="test-case-path-type" value="file"/>
+ <option name="test-timeout" value="10m"/>
+ <option name="test-config-path" value="vts/testcases/hal/bluetooth/V1_0/app/VtsAppBluetooth.config" />
+ <option name="exclude-filter" value="ThroughputTest.test_iperf_max_ndp_aware_only_oob" />
+ </test>
+</configuration>
diff --git a/bluetooth/V1_0/app/VtsAppBluetooth.config b/bluetooth/V1_0/app/VtsAppBluetooth.config
new file mode 100644
index 0000000..af0bb9b
--- /dev/null
+++ b/bluetooth/V1_0/app/VtsAppBluetooth.config
@@ -0,0 +1,22 @@
+{
+ "test_bed":
+ [
+ {
+ "name": "VtsAppBluetooth",
+ "AndroidDevice":
+ [
+ {
+ "enable_sl4a": true,
+ "enable_sl4a_ed": true,
+ "enable_vts_agent": false
+ },
+ {
+ "enable_sl4a": true,
+ "enable_sl4a_ed": true,
+ "enable_vts_agent": false
+ }
+ ]
+ }
+ ],
+ "aware_default_power_mode": "INTERACTIVE"
+}
diff --git a/broadcastradio/V1_0/OWNERS b/broadcastradio/V1_0/OWNERS
new file mode 100644
index 0000000..b159083
--- /dev/null
+++ b/broadcastradio/V1_0/OWNERS
@@ -0,0 +1,4 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
+twasilczyk@google.com
diff --git a/broadcastradio/V1_1/target/AndroidTest.xml b/broadcastradio/V1_1/target/AndroidTest.xml
index 00c6a69..4efea71 100644
--- a/broadcastradio/V1_1/target/AndroidTest.xml
+++ b/broadcastradio/V1_1/target/AndroidTest.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for VTS VtsHalBroadcastradioV1_0Target test cases">
+<configuration description="Config for VTS VtsHalBroadcastradioV1_1Target test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HalHidlTargetTest.push"/>
diff --git a/camera/device/V3_3/Android.bp b/camera/device/V3_3/Android.bp
index 995dd5b..de775f2 100644
--- a/camera/device/V3_3/Android.bp
+++ b/camera/device/V3_3/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/camera/device/V3_3/build/Android.bp b/camera/device/V3_3/build/Android.bp
index 1cc2e8f..2256ea0 100644
--- a/camera/device/V3_3/build/Android.bp
+++ b/camera/device/V3_3/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -45,46 +45,17 @@
generated_sources: ["android.hardware.camera.device@3.3-vts.driver_genc++"],
generated_headers: ["android.hardware.camera.device@3.3-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.camera.device@3.3-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ "android.hardware.camera.common@1.0-vts.driver",
+ "android.hardware.camera.device@3.2-vts.driver",
+ "android.hardware.graphics.common@1.0-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.camera.common@1.0",
+ "android.hardware.camera.device@3.2",
"android.hardware.camera.device@3.3",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.common@1.0-vts.driver",
- "android.hardware.camera.device@3.2",
- "android.hardware.camera.device@3.2-vts.driver",
"android.hardware.graphics.common@1.0",
- "android.hardware.graphics.common@1.0-vts.driver",
- ],
- export_shared_lib_headers: [
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.common@1.0-vts.driver",
- "android.hardware.camera.device@3.2",
- "android.hardware.camera.device@3.2-vts.driver",
- "android.hardware.graphics.common@1.0",
- "android.hardware.graphics.common@1.0-vts.driver",
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -120,32 +91,17 @@
generated_sources: ["android.hardware.camera.device@3.3-vts.profiler_genc++"],
generated_headers: ["android.hardware.camera.device@3.3-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.camera.device@3.3-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.camera.device@3.3",
- "android.hardware.camera.common@1.0",
"android.hardware.camera.common@1.0-vts.profiler",
- "android.hardware.camera.device@3.2",
"android.hardware.camera.device@3.2-vts.profiler",
- "android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.profiler",
],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
+ static_libs: [
+ "android.hardware.camera.common@1.0",
+ "android.hardware.camera.device@3.2",
+ "android.hardware.camera.device@3.3",
+ "android.hardware.graphics.common@1.0",
],
}
diff --git a/cas/Android.bp b/cas/Android.bp
new file mode 100644
index 0000000..903d029
--- /dev/null
+++ b/cas/Android.bp
@@ -0,0 +1,7 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+subdirs = [
+ "V1_0",
+ "native/V1_0",
+]
diff --git a/cas/V1_0/Android.bp b/cas/V1_0/Android.bp
new file mode 100644
index 0000000..de775f2
--- /dev/null
+++ b/cas/V1_0/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/cas/V1_0/build/Android.bp b/cas/V1_0/build/Android.bp
new file mode 100644
index 0000000..ae9e9a2
--- /dev/null
+++ b/cas/V1_0/build/Android.bp
@@ -0,0 +1,108 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hardware.cas@1.0-vts.spec",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts",
+ "android/hardware/cas/1.0/CasListener.vts",
+ "android/hardware/cas/1.0/DescramblerBase.vts",
+ "android/hardware/cas/1.0/MediaCasService.vts",
+ "android/hardware/cas/1.0/types.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.cas@1.0-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts.cpp",
+ "android/hardware/cas/1.0/CasListener.vts.cpp",
+ "android/hardware/cas/1.0/DescramblerBase.vts.cpp",
+ "android/hardware/cas/1.0/MediaCasService.vts.cpp",
+ "android/hardware/cas/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.cas@1.0-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts.h",
+ "android/hardware/cas/1.0/CasListener.vts.h",
+ "android/hardware/cas/1.0/DescramblerBase.vts.h",
+ "android/hardware/cas/1.0/MediaCasService.vts.h",
+ "android/hardware/cas/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.cas@1.0-vts.driver",
+ generated_sources: ["android.hardware.cas@1.0-vts.driver_genc++"],
+ generated_headers: ["android.hardware.cas@1.0-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.cas@1.0-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [],
+ static_libs: [
+ "android.hardware.cas@1.0",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.cas@1.0-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts.cpp",
+ "android/hardware/cas/1.0/CasListener.vts.cpp",
+ "android/hardware/cas/1.0/DescramblerBase.vts.cpp",
+ "android/hardware/cas/1.0/MediaCasService.vts.cpp",
+ "android/hardware/cas/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.cas@1.0-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+ srcs: [
+ ":android.hardware.cas@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/1.0/Cas.vts.h",
+ "android/hardware/cas/1.0/CasListener.vts.h",
+ "android/hardware/cas/1.0/DescramblerBase.vts.h",
+ "android/hardware/cas/1.0/MediaCasService.vts.h",
+ "android/hardware/cas/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.cas@1.0-vts.profiler",
+ generated_sources: ["android.hardware.cas@1.0-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.cas@1.0-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.cas@1.0-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [],
+ static_libs: [
+ "android.hardware.cas@1.0",
+ ],
+}
+
diff --git a/cas/native/V1_0/Android.bp b/cas/native/V1_0/Android.bp
new file mode 100644
index 0000000..de775f2
--- /dev/null
+++ b/cas/native/V1_0/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/cas/native/V1_0/build/Android.bp b/cas/native/V1_0/build/Android.bp
new file mode 100644
index 0000000..7ed283f
--- /dev/null
+++ b/cas/native/V1_0/build/Android.bp
@@ -0,0 +1,99 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hardware.cas.native@1.0-vts.spec",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts",
+ "android/hardware/cas/native/1.0/types.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.cas.native@1.0-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts.cpp",
+ "android/hardware/cas/native/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.cas.native@1.0-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts.h",
+ "android/hardware/cas/native/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.cas.native@1.0-vts.driver",
+ generated_sources: ["android.hardware.cas.native@1.0-vts.driver_genc++"],
+ generated_headers: ["android.hardware.cas.native@1.0-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.cas.native@1.0-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [
+ "android.hardware.cas@1.0-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.cas.native@1.0",
+ "android.hardware.cas@1.0",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.cas.native@1.0-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts.cpp",
+ "android/hardware/cas/native/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.cas.native@1.0-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+ srcs: [
+ ":android.hardware.cas.native@1.0_hal",
+ ],
+ out: [
+ "android/hardware/cas/native/1.0/Descrambler.vts.h",
+ "android/hardware/cas/native/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.cas.native@1.0-vts.profiler",
+ generated_sources: ["android.hardware.cas.native@1.0-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.cas.native@1.0-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.cas.native@1.0-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [
+ "android.hardware.cas@1.0-vts.profiler",
+ ],
+ static_libs: [
+ "android.hardware.cas.native@1.0",
+ "android.hardware.cas@1.0",
+ ],
+}
+
diff --git a/configstore/Android.bp b/configstore/Android.bp
index 33d2802..6af8515 100644
--- a/configstore/Android.bp
+++ b/configstore/Android.bp
@@ -3,4 +3,5 @@
subdirs = [
"V1_0",
+ "V1_1",
]
diff --git a/configstore/V1_1/Android.bp b/configstore/V1_1/Android.bp
new file mode 100644
index 0000000..de775f2
--- /dev/null
+++ b/configstore/V1_1/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/configstore/V1_1/build/Android.bp b/configstore/V1_1/build/Android.bp
new file mode 100644
index 0000000..50cf2e9
--- /dev/null
+++ b/configstore/V1_1/build/Android.bp
@@ -0,0 +1,94 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hardware.configstore@1.1-vts.spec",
+ srcs: [
+ ":android.hardware.configstore@1.1_hal",
+ ],
+ out: [
+ "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.configstore@1.1-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
+ srcs: [
+ ":android.hardware.configstore@1.1_hal",
+ ],
+ out: [
+ "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.configstore@1.1-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
+ srcs: [
+ ":android.hardware.configstore@1.1_hal",
+ ],
+ out: [
+ "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.configstore@1.1-vts.driver",
+ generated_sources: ["android.hardware.configstore@1.1-vts.driver_genc++"],
+ generated_headers: ["android.hardware.configstore@1.1-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.configstore@1.1-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [
+ "android.hardware.configstore@1.0-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.configstore@1.0",
+ "android.hardware.configstore@1.1",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.configstore@1.1-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
+ srcs: [
+ ":android.hardware.configstore@1.1_hal",
+ ],
+ out: [
+ "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.configstore@1.1-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
+ srcs: [
+ ":android.hardware.configstore@1.1_hal",
+ ],
+ out: [
+ "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.configstore@1.1-vts.profiler",
+ generated_sources: ["android.hardware.configstore@1.1-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.configstore@1.1-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.configstore@1.1-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [
+ "android.hardware.configstore@1.0-vts.profiler",
+ ],
+ static_libs: [
+ "android.hardware.configstore@1.0",
+ "android.hardware.configstore@1.1",
+ ],
+}
+
diff --git a/configstore/V1_1/target/Android.mk b/configstore/V1_1/target/Android.mk
new file mode 100644
index 0000000..bb9ddcd
--- /dev/null
+++ b/configstore/V1_1/target/Android.mk
@@ -0,0 +1,23 @@
+#
+# 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 $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalConfigstoreV1_1Target
+VTS_CONFIG_SRC_DIR := testcases/hal/configstore/V1_1/target
+include test/vts/tools/build/Android.host_config.mk
diff --git a/configstore/V1_1/target/AndroidTest.xml b/configstore/V1_1/target/AndroidTest.xml
new file mode 100644
index 0000000..246ddd6
--- /dev/null
+++ b/configstore/V1_1/target/AndroidTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Config for VTS VtsHalConfigstoreV1_1Target test cases">
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false"/>
+ <option name="push-group" value="HalHidlTargetTest.push"/>
+ </target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsHalConfigstoreV1_1Target"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalConfigstoreV1_1TargetTest/VtsHalConfigstoreV1_1TargetTest" />
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalConfigstoreV1_1TargetTest/VtsHalConfigstoreV1_1TargetTest" />
+ <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-disable-framework" value="true"/>
+ <option name="binary-test-stop-native-servers" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.configstore@1.1"/>
+ <option name="test-timeout" value="5m"/>
+ </test>
+</configuration>
diff --git a/configstore/V1_1/target_profiling/Android.mk b/configstore/V1_1/target_profiling/Android.mk
new file mode 100644
index 0000000..6409e6f
--- /dev/null
+++ b/configstore/V1_1/target_profiling/Android.mk
@@ -0,0 +1,23 @@
+#
+# 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 $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsHalConfigstoreV1_1TargetProfiling
+VTS_CONFIG_SRC_DIR := testcases/hal/configstore/V1_1/target_profiling
+include test/vts/tools/build/Android.host_config.mk
diff --git a/configstore/V1_1/target_profiling/AndroidTest.xml b/configstore/V1_1/target_profiling/AndroidTest.xml
new file mode 100644
index 0000000..0513224
--- /dev/null
+++ b/configstore/V1_1/target_profiling/AndroidTest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Config for VTS VtsHalConfigstoreV1_1TargetProfiling test cases">
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false"/>
+ <option name="push-group" value="HalHidlTargetProfilingTest.push"/>
+ <option name="cleanup" value="true"/>
+ <option name="push" value="DATA/lib/android.hardware.configstore@1.1-vts.profiler.so->/data/local/tmp/32/android.hardware.configstore@1.1-vts.profiler.so"/>
+ <option name="push" value="DATA/lib64/android.hardware.configstore@1.1-vts.profiler.so->/data/local/tmp/64/android.hardware.configstore@1.1-vts.profiler.so"/>
+ </target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsHalConfigstoreV1_1TargetProfiling"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalConfigstoreV1_1TargetTest/VtsHalConfigstoreV1_1TargetTest" />
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalConfigstoreV1_1TargetTest/VtsHalConfigstoreV1_1TargetTest" />
+ <option name="binary-test-type" value="hal_hidl_gtest"/>
+ <option name="binary-test-disable-framework" value="true"/>
+ <option name="binary-test-stop-native-servers" value="true"/>
+ <option name="enable-profiling" value="true"/>
+ <option name="precondition-lshal" value="android.hardware.configstore@1.1"/>
+ <option name="test-timeout" value="5m"/>
+ </test>
+</configuration>
diff --git a/keymaster/V3_0/target_profiling/AndroidTest.xml b/keymaster/V3_0/target_profiling/AndroidTest.xml
index 8778c55..ff9b78d 100644
--- a/keymaster/V3_0/target_profiling/AndroidTest.xml
+++ b/keymaster/V3_0/target_profiling/AndroidTest.xml
@@ -16,7 +16,7 @@
<configuration description="Config for VTS VtsHalKeymasterV3_0TargetProfiling test cases">
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
- <option name="push-group" value="HalHidlHostTest.push"/>
+ <option name="push-group" value="HalHidlTargetProfilingTest.push"/>
<option name="push" value="DATA/lib/android.hardware.keymaster@3.0-vts.profiler.so->/data/local/tmp/32/android.hardware.keymaster@3.0-vts.profiler.so"/>
<option name="push" value="DATA/lib64/android.hardware.keymaster@3.0-vts.profiler.so->/data/local/tmp/64/android.hardware.keymaster@3.0-vts.profiler.so"/>
</target_preparer>
diff --git a/media/omx/V1_0/host/AndroidTest.xml b/media/omx/V1_0/host/AndroidTest.xml
index 327bc73..df01b09 100644
--- a/media/omx/V1_0/host/AndroidTest.xml
+++ b/media/omx/V1_0/host/AndroidTest.xml
@@ -95,11 +95,16 @@
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalMediaOmxV1_0TargetAudioDecTest/VtsHalMediaOmxV1_0TargetAudioDecTest"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalMediaOmxV1_0TargetVideoEncTest/VtsHalMediaOmxV1_0TargetVideoEncTest"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalMediaOmxV1_0TargetVideoDecTest/VtsHalMediaOmxV1_0TargetVideoDecTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalMediaOmxV1_0TargetComponentTest/VtsHalMediaOmxV1_0TargetComponentTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalMediaOmxV1_0TargetAudioEncTest/VtsHalMediaOmxV1_0TargetAudioEncTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalMediaOmxV1_0TargetAudioDecTest/VtsHalMediaOmxV1_0TargetAudioDecTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalMediaOmxV1_0TargetVideoEncTest/VtsHalMediaOmxV1_0TargetVideoEncTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalMediaOmxV1_0TargetVideoDecTest/VtsHalMediaOmxV1_0TargetVideoDecTest"/>
<option name="binary-test-disable-framework" value="true"/>
<option name="binary-test-stop-native-servers" value="true"/>
<option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>
<option name="precondition-lshal" value="android.hardware.media.omx@1.0"/>
<option name="test-timeout" value="2h"/>
- <option name="runtime-hint" value="40m"/>
+ <option name="runtime-hint" value="10m"/>
</test>
</configuration>
diff --git a/media/omx/V1_0/host/VtsHalMediaOmxV1_0HostTest.py b/media/omx/V1_0/host/VtsHalMediaOmxV1_0HostTest.py
index 20043b5..338c1d9 100644
--- a/media/omx/V1_0/host/VtsHalMediaOmxV1_0HostTest.py
+++ b/media/omx/V1_0/host/VtsHalMediaOmxV1_0HostTest.py
@@ -121,7 +121,7 @@
instance_name = "default"
test_case = omx_test_case.VtsHalMediaOmxV1_0TestCase(
component, role, instance_name, test_suite, test_name,
- path)
+ path, tag)
test_cases.append(test_case)
logging.info("num of test_testcases: %s", len(test_cases))
return test_cases
diff --git a/neuralnetworks/Android.bp b/neuralnetworks/Android.bp
index cdc8905..33d2802 100644
--- a/neuralnetworks/Android.bp
+++ b/neuralnetworks/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"V1_0",
diff --git a/neuralnetworks/V1_0/Android.bp b/neuralnetworks/V1_0/Android.bp
index 995dd5b..de775f2 100644
--- a/neuralnetworks/V1_0/Android.bp
+++ b/neuralnetworks/V1_0/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/neuralnetworks/V1_0/build/Android.bp b/neuralnetworks/V1_0/build/Android.bp
index c2ca1b3..fc833b3 100644
--- a/neuralnetworks/V1_0/build/Android.bp
+++ b/neuralnetworks/V1_0/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -54,36 +54,10 @@
generated_sources: ["android.hardware.neuralnetworks@1.0-vts.driver_genc++"],
generated_headers: ["android.hardware.neuralnetworks@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.neuralnetworks@1.0-vts.driver_genc++_headers"],
- shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [],
+ static_libs: [
"android.hardware.neuralnetworks@1.0",
-
- ],
- export_shared_lib_headers: [
-
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -125,27 +99,10 @@
generated_sources: ["android.hardware.neuralnetworks@1.0-vts.profiler_genc++"],
generated_headers: ["android.hardware.neuralnetworks@1.0-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.neuralnetworks@1.0-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [],
+ static_libs: [
"android.hardware.neuralnetworks@1.0",
-
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/oemlock/Android.bp b/oemlock/Android.bp
index cdc8905..33d2802 100644
--- a/oemlock/Android.bp
+++ b/oemlock/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"V1_0",
diff --git a/oemlock/V1_0/Android.bp b/oemlock/V1_0/Android.bp
index 995dd5b..de775f2 100644
--- a/oemlock/V1_0/Android.bp
+++ b/oemlock/V1_0/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/oemlock/V1_0/build/Android.bp b/oemlock/V1_0/build/Android.bp
index 3dfaa93..87ce982 100644
--- a/oemlock/V1_0/build/Android.bp
+++ b/oemlock/V1_0/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -45,36 +45,10 @@
generated_sources: ["android.hardware.oemlock@1.0-vts.driver_genc++"],
generated_headers: ["android.hardware.oemlock@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.oemlock@1.0-vts.driver_genc++_headers"],
- shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [],
+ static_libs: [
"android.hardware.oemlock@1.0",
-
- ],
- export_shared_lib_headers: [
-
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -110,27 +84,10 @@
generated_sources: ["android.hardware.oemlock@1.0-vts.profiler_genc++"],
generated_headers: ["android.hardware.oemlock@1.0-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.oemlock@1.0-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [],
+ static_libs: [
"android.hardware.oemlock@1.0",
-
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/power/V1_1/Android.bp b/power/V1_1/Android.bp
index 995dd5b..de775f2 100644
--- a/power/V1_1/Android.bp
+++ b/power/V1_1/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/power/V1_1/build/Android.bp b/power/V1_1/build/Android.bp
index 3d9e3ad..883af1c 100644
--- a/power/V1_1/build/Android.bp
+++ b/power/V1_1/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -45,41 +45,13 @@
generated_sources: ["android.hardware.power@1.1-vts.driver_genc++"],
generated_headers: ["android.hardware.power@1.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.power@1.1-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ "android.hardware.power@1.0-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.power@1.0",
"android.hardware.power@1.1",
- "android.hardware.power@1.0",
- "android.hardware.power@1.0-vts.driver",
- ],
- export_shared_lib_headers: [
- "android.hardware.power@1.0",
- "android.hardware.power@1.0-vts.driver",
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -115,31 +87,13 @@
generated_sources: ["android.hardware.power@1.1-vts.profiler_genc++"],
generated_headers: ["android.hardware.power@1.1-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.power@1.1-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.power@1.1",
- "android.hardware.power@1.0",
"android.hardware.power@1.0-vts.profiler",
],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
+ static_libs: [
+ "android.hardware.power@1.0",
+ "android.hardware.power@1.1",
],
}
diff --git a/radio/V1_0/host/VtsHalRadioV1_0HostTest.py b/radio/V1_0/host/VtsHalRadioV1_0HostTest.py
index 2e6c540..f295c72 100644
--- a/radio/V1_0/host/VtsHalRadioV1_0HostTest.py
+++ b/radio/V1_0/host/VtsHalRadioV1_0HostTest.py
@@ -48,7 +48,7 @@
target_version=1.0,
target_package="android.hardware.radio",
target_component_name="IRadio",
- hw_binder_service_name="Radio",
+ hw_binder_service_name="slot1",
bits=int(self.abi_bitness))
self.radio = self.dut.hal.radio # shortcut
diff --git a/soundtrigger/V2_0/OWNERS b/soundtrigger/V2_0/OWNERS
new file mode 100644
index 0000000..6fdc97c
--- /dev/null
+++ b/soundtrigger/V2_0/OWNERS
@@ -0,0 +1,3 @@
+elaurent@google.com
+krocard@google.com
+mnaganov@google.com
diff --git a/thermal/V1_1/Android.bp b/thermal/V1_1/Android.bp
index 995dd5b..de775f2 100644
--- a/thermal/V1_1/Android.bp
+++ b/thermal/V1_1/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/thermal/V1_1/build/Android.bp b/thermal/V1_1/build/Android.bp
index ecd29b4..c28f92a 100644
--- a/thermal/V1_1/build/Android.bp
+++ b/thermal/V1_1/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -45,38 +45,13 @@
generated_sources: ["android.hardware.thermal@1.1-vts.driver_genc++"],
generated_headers: ["android.hardware.thermal@1.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.thermal@1.1-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ "android.hardware.thermal@1.0-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.thermal@1.0",
"android.hardware.thermal@1.1",
- "android.hardware.thermal@1.0",
- "android.hardware.thermal@1.0-vts.driver",
- ],
- export_shared_lib_headers: [
- "android.hardware.thermal@1.0",
- "android.hardware.thermal@1.0-vts.driver",
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -112,28 +87,13 @@
generated_sources: ["android.hardware.thermal@1.1-vts.profiler_genc++"],
generated_headers: ["android.hardware.thermal@1.1-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.thermal@1.1-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.thermal@1.1",
- "android.hardware.thermal@1.0",
"android.hardware.thermal@1.0-vts.profiler",
],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
+ static_libs: [
+ "android.hardware.thermal@1.0",
+ "android.hardware.thermal@1.1",
],
}
diff --git a/treble/platform_version/VtsTreblePlatformVersionTest.py b/treble/platform_version/VtsTreblePlatformVersionTest.py
index 53130d9..b3404d9 100644
--- a/treble/platform_version/VtsTreblePlatformVersionTest.py
+++ b/treble/platform_version/VtsTreblePlatformVersionTest.py
@@ -82,5 +82,11 @@
except ValueError as e:
asserts.fail("Unexpected value returned from getprop: %s" % e)
+ def testVndkVersion(self):
+ """Test that VNDK version is specified."""
+ vndkVersion = self.getProp("ro.vendor.vndk.version")
+ asserts.assertLess(0, len(vndkVersion),
+ "VNDK version is not defined")
+
if __name__ == "__main__":
test_runner.main()
diff --git a/usb/V1_1/Android.bp b/usb/V1_1/Android.bp
index 995dd5b..de775f2 100644
--- a/usb/V1_1/Android.bp
+++ b/usb/V1_1/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/usb/V1_1/build/Android.bp b/usb/V1_1/build/Android.bp
index 02ad66c..d18f661 100644
--- a/usb/V1_1/build/Android.bp
+++ b/usb/V1_1/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -48,41 +48,13 @@
generated_sources: ["android.hardware.usb@1.1-vts.driver_genc++"],
generated_headers: ["android.hardware.usb@1.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.usb@1.1-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ "android.hardware.usb@1.0-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.usb@1.0",
"android.hardware.usb@1.1",
- "android.hardware.usb@1.0",
- "android.hardware.usb@1.0-vts.driver",
- ],
- export_shared_lib_headers: [
- "android.hardware.usb@1.0",
- "android.hardware.usb@1.0-vts.driver",
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -120,31 +92,13 @@
generated_sources: ["android.hardware.usb@1.1-vts.profiler_genc++"],
generated_headers: ["android.hardware.usb@1.1-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.usb@1.1-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.usb@1.1",
- "android.hardware.usb@1.0",
"android.hardware.usb@1.0-vts.profiler",
],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
+ static_libs: [
+ "android.hardware.usb@1.0",
+ "android.hardware.usb@1.1",
],
}
diff --git a/vibrator/Android.bp b/vibrator/Android.bp
index 33d2802..6af8515 100644
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -3,4 +3,5 @@
subdirs = [
"V1_0",
+ "V1_1",
]
diff --git a/vibrator/V1_1/Android.bp b/vibrator/V1_1/Android.bp
new file mode 100644
index 0000000..de775f2
--- /dev/null
+++ b/vibrator/V1_1/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/vibrator/V1_1/build/Android.bp b/vibrator/V1_1/build/Android.bp
new file mode 100644
index 0000000..641fb99
--- /dev/null
+++ b/vibrator/V1_1/build/Android.bp
@@ -0,0 +1,99 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hardware.vibrator@1.1-vts.spec",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts",
+ "android/hardware/vibrator/1.1/types.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.vibrator@1.1-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts.cpp",
+ "android/hardware/vibrator/1.1/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.vibrator@1.1-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts.h",
+ "android/hardware/vibrator/1.1/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.vibrator@1.1-vts.driver",
+ generated_sources: ["android.hardware.vibrator@1.1-vts.driver_genc++"],
+ generated_headers: ["android.hardware.vibrator@1.1-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.vibrator@1.1-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [
+ "android.hardware.vibrator@1.0-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.vibrator@1.0",
+ "android.hardware.vibrator@1.1",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.vibrator@1.1-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts.cpp",
+ "android/hardware/vibrator/1.1/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.vibrator@1.1-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+ srcs: [
+ ":android.hardware.vibrator@1.1_hal",
+ ],
+ out: [
+ "android/hardware/vibrator/1.1/Vibrator.vts.h",
+ "android/hardware/vibrator/1.1/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.vibrator@1.1-vts.profiler",
+ generated_sources: ["android.hardware.vibrator@1.1-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.vibrator@1.1-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.vibrator@1.1-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [
+ "android.hardware.vibrator@1.0-vts.profiler",
+ ],
+ static_libs: [
+ "android.hardware.vibrator@1.0",
+ "android.hardware.vibrator@1.1",
+ ],
+}
+
diff --git a/weaver/Android.bp b/weaver/Android.bp
index cdc8905..33d2802 100644
--- a/weaver/Android.bp
+++ b/weaver/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"V1_0",
diff --git a/weaver/V1_0/Android.bp b/weaver/V1_0/Android.bp
index 995dd5b..de775f2 100644
--- a/weaver/V1_0/Android.bp
+++ b/weaver/V1_0/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/weaver/V1_0/build/Android.bp b/weaver/V1_0/build/Android.bp
index dd9da7d..06ad234 100644
--- a/weaver/V1_0/build/Android.bp
+++ b/weaver/V1_0/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -45,36 +45,10 @@
generated_sources: ["android.hardware.weaver@1.0-vts.driver_genc++"],
generated_headers: ["android.hardware.weaver@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.weaver@1.0-vts.driver_genc++_headers"],
- shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [],
+ static_libs: [
"android.hardware.weaver@1.0",
-
- ],
- export_shared_lib_headers: [
-
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -110,27 +84,10 @@
generated_sources: ["android.hardware.weaver@1.0-vts.profiler_genc++"],
generated_headers: ["android.hardware.weaver@1.0-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.weaver@1.0-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [],
+ static_libs: [
"android.hardware.weaver@1.0",
-
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 7bfd01f..30afc0c 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -4,6 +4,7 @@
subdirs = [
"V1_0",
"V1_1",
+ "V1_2",
"offload/V1_0",
"supplicant/V1_0",
]
diff --git a/wifi/V1_0/app/wifi_native_test/Android.mk b/wifi/V1_0/app/wifi_native_test/Android.mk
new file mode 100644
index 0000000..5ee16cb
--- /dev/null
+++ b/wifi/V1_0/app/wifi_native_test/Android.mk
@@ -0,0 +1,24 @@
+#
+# 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 $(CLEAR_VARS)
+
+LOCAL_MODULE := VtsAppWifiNativeTest
+VTS_CONFIG_SRC_DIR := testcases/hal/wifi/V1_0/app/wifi_native_test
+include test/vts/tools/build/Android.host_config.mk
+
diff --git a/wifi/V1_0/app/wifi_native_test/AndroidTest.xml b/wifi/V1_0/app/wifi_native_test/AndroidTest.xml
new file mode 100644
index 0000000..933fdad
--- /dev/null
+++ b/wifi/V1_0/app/wifi_native_test/AndroidTest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Config for VTS VtsAppWifiAwarePerformanceThroughput test cases">
+ <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+ <option name="no-dep-module" value="enum" />
+ <option name="dep-module" value="enum34" />
+ <option name="dep-module" value="pyserial" />
+ <option name="dep-module" value="shellescape" />
+ <option name="dep-module" value="statistics" />
+ <option name="dep-module" value="subprocess32" />
+ </target_preparer>
+
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="true"/>
+ <option name="push-group" value="HalHidlHostTest.push"/>
+ <option name="cleanup" value="true"/>
+ </target_preparer>
+
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+ <option name="test-file-name" value="DATA/app/sl4a/sl4a.apk" />
+ <option name="cleanup-apks" value="true" />
+ <option name="install-arg" value="-r" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsAppWifiNativeTest"/>
+ <option name="test-case-path" value="vts/testcases/acts/wifi/WifiNativeTest"/>
+ <option name="test-case-path-type" value="file"/>
+ <option name="test-timeout" value="10m"/>
+ <option name="test-config-path" value="vts/testcases/hal/wifi/V1_0/app/wifi_native_test/VtsAppWifiNativeTest.config" />
+ </test>
+</configuration>
diff --git a/wifi/V1_0/app/wifi_native_test/VtsAppWifiNativeTest.config b/wifi/V1_0/app/wifi_native_test/VtsAppWifiNativeTest.config
new file mode 100644
index 0000000..bb9c041
--- /dev/null
+++ b/wifi/V1_0/app/wifi_native_test/VtsAppWifiNativeTest.config
@@ -0,0 +1,16 @@
+{
+ "test_bed":
+ [
+ {
+ "name": "VtsAppWifiNativeTest",
+ "AndroidDevice":
+ [
+ {
+ "enable_sl4a": true,
+ "enable_vts_agent": false
+ }
+ ]
+ }
+ ],
+ "aware_default_power_mode": "INTERACTIVE"
+}
diff --git a/wifi/V1_1/Android.bp b/wifi/V1_1/Android.bp
index 995dd5b..de775f2 100644
--- a/wifi/V1_1/Android.bp
+++ b/wifi/V1_1/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/wifi/V1_1/build/Android.bp b/wifi/V1_1/build/Android.bp
index a2bb596..6449d00 100644
--- a/wifi/V1_1/build/Android.bp
+++ b/wifi/V1_1/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -45,41 +45,13 @@
generated_sources: ["android.hardware.wifi@1.1-vts.driver_genc++"],
generated_headers: ["android.hardware.wifi@1.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.wifi@1.1-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ "android.hardware.wifi@1.0-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.wifi@1.0",
"android.hardware.wifi@1.1",
- "android.hardware.wifi@1.0",
- "android.hardware.wifi@1.0-vts.driver",
- ],
- export_shared_lib_headers: [
- "android.hardware.wifi@1.0",
- "android.hardware.wifi@1.0-vts.driver",
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -115,31 +87,13 @@
generated_sources: ["android.hardware.wifi@1.1-vts.profiler_genc++"],
generated_headers: ["android.hardware.wifi@1.1-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.wifi@1.1-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
- "android.hardware.wifi@1.1",
- "android.hardware.wifi@1.0",
"android.hardware.wifi@1.0-vts.profiler",
],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
+ static_libs: [
+ "android.hardware.wifi@1.0",
+ "android.hardware.wifi@1.1",
],
}
diff --git a/wifi/V1_2/Android.bp b/wifi/V1_2/Android.bp
new file mode 100644
index 0000000..de775f2
--- /dev/null
+++ b/wifi/V1_2/Android.bp
@@ -0,0 +1,6 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+subdirs = [
+ "*",
+]
diff --git a/wifi/V1_2/build/Android.bp b/wifi/V1_2/build/Android.bp
new file mode 100644
index 0000000..27fece1
--- /dev/null
+++ b/wifi/V1_2/build/Android.bp
@@ -0,0 +1,103 @@
+// This file was auto-generated. Do not edit manually.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hardware.wifi@1.2-vts.spec",
+ srcs: [
+ ":android.hardware.wifi@1.2_hal",
+ ],
+ out: [
+ "android/hardware/wifi/1.2/Wifi.vts",
+ "android/hardware/wifi/1.2/WifiChip.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.wifi@1.2-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
+ srcs: [
+ ":android.hardware.wifi@1.2_hal",
+ ],
+ out: [
+ "android/hardware/wifi/1.2/Wifi.vts.cpp",
+ "android/hardware/wifi/1.2/WifiChip.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.wifi@1.2-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
+ srcs: [
+ ":android.hardware.wifi@1.2_hal",
+ ],
+ out: [
+ "android/hardware/wifi/1.2/Wifi.vts.h",
+ "android/hardware/wifi/1.2/WifiChip.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.wifi@1.2-vts.driver",
+ generated_sources: ["android.hardware.wifi@1.2-vts.driver_genc++"],
+ generated_headers: ["android.hardware.wifi@1.2-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.wifi@1.2-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [
+ "android.hardware.wifi@1.0-vts.driver",
+ "android.hardware.wifi@1.1-vts.driver",
+ ],
+ static_libs: [
+ "android.hardware.wifi@1.0",
+ "android.hardware.wifi@1.1",
+ "android.hardware.wifi@1.2",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.wifi@1.2-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
+ srcs: [
+ ":android.hardware.wifi@1.2_hal",
+ ],
+ out: [
+ "android/hardware/wifi/1.2/Wifi.vts.cpp",
+ "android/hardware/wifi/1.2/WifiChip.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.wifi@1.2-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
+ srcs: [
+ ":android.hardware.wifi@1.2_hal",
+ ],
+ out: [
+ "android/hardware/wifi/1.2/Wifi.vts.h",
+ "android/hardware/wifi/1.2/WifiChip.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.wifi@1.2-vts.profiler",
+ generated_sources: ["android.hardware.wifi@1.2-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.wifi@1.2-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.wifi@1.2-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [
+ "android.hardware.wifi@1.0-vts.profiler",
+ "android.hardware.wifi@1.1-vts.profiler",
+ ],
+ static_libs: [
+ "android.hardware.wifi@1.0",
+ "android.hardware.wifi@1.1",
+ "android.hardware.wifi@1.2",
+ ],
+}
+
diff --git a/wifi/offload/V1_0/Android.bp b/wifi/offload/V1_0/Android.bp
index 995dd5b..de775f2 100644
--- a/wifi/offload/V1_0/Android.bp
+++ b/wifi/offload/V1_0/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
subdirs = [
"*",
diff --git a/wifi/offload/V1_0/build/Android.bp b/wifi/offload/V1_0/build/Android.bp
index b5c12f4..64bbc54 100644
--- a/wifi/offload/V1_0/build/Android.bp
+++ b/wifi/offload/V1_0/build/Android.bp
@@ -1,5 +1,5 @@
// This file was auto-generated. Do not edit manually.
-// Use test/vts-testcase/hal/update_makefiles.py to generate this file.
+// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file.
// Generate .vts spec files.
hal2vts {
@@ -48,39 +48,10 @@
generated_sources: ["android.hardware.wifi.offload@1.0-vts.driver_genc++"],
generated_headers: ["android.hardware.wifi.offload@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.wifi.offload@1.0-vts.driver_genc++_headers"],
- shared_libs: [
- "libcamera_metadata",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libprotobuf-cpp-full",
- "libutils",
- "libvts_common",
- "libvts_datatype",
- "libvts_drivercomm",
- "libvts_measurement",
- "libvts_multidevice_proto",
- "android.hidl.allocator@1.0",
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [],
+ static_libs: [
"android.hardware.wifi.offload@1.0",
-
- ],
- export_shared_lib_headers: [
-
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}
@@ -118,30 +89,10 @@
generated_sources: ["android.hardware.wifi.offload@1.0-vts.profiler_genc++"],
generated_headers: ["android.hardware.wifi.offload@1.0-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.wifi.offload@1.0-vts.profiler_genc++_headers"],
- shared_libs: [
- "libbase",
- "libcutils",
- "libfmq",
- "libhidlbase",
- "libhidltransport",
- "libvts_common",
- "libvts_profiling",
- "libvts_multidevice_proto",
- "libprotobuf-cpp-full",
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [],
+ static_libs: [
"android.hardware.wifi.offload@1.0",
-
- ],
- cflags: [
- "-Wall",
- "-Werror",
-
- // These warnings are in code generated with vtsc
- // b/31362043
- "-Wno-unused-parameter",
- "-Wno-unused-variable",
- "-Wno-unused-private-field",
- "-Wno-duplicate-decl-specifier",
- "-Wno-implicitly-unsigned-literal",
],
}