Add health hal VTS test stubs.
am: 39d3840f10
Change-Id: If3ad63591c500708ae4a0917b3510ca7376f518f
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..6027082
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,13 @@
+---
+Language: Cpp
+BasedOnStyle: Google
+ColumnLimit: 80
+IndentWidth: 2
+ContinuationIndentWidth: 4
+---
+Language: Java
+BasedOnStyle: Google
+ColumnLimit: 100
+IndentWidth: 4
+ContinuationIndentWidth: 8
+...
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..6be6e5f
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,6 @@
+[Builtin Hooks]
+clang_format = true
+
+[Builtin Hooks Options]
+clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp,java
+
diff --git a/audio/V2_0/build/Android.bp b/audio/V2_0/build/Android.bp
index 5e948d4..5e51c1d 100644
--- a/audio/V2_0/build/Android.bp
+++ b/audio/V2_0/build/Android.bp
@@ -80,12 +80,10 @@
"android.hardware.audio@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -143,7 +141,6 @@
"android.hardware.audio@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/audio/effect/V2_0/build/Android.bp b/audio/effect/V2_0/build/Android.bp
index bf0e985..f72e2e9 100644
--- a/audio/effect/V2_0/build/Android.bp
+++ b/audio/effect/V2_0/build/Android.bp
@@ -101,12 +101,10 @@
"android.hardware.audio.effect@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -178,7 +176,6 @@
"android.hardware.audio.effect@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/automotive/evs/V1_0/build/Android.bp b/automotive/evs/V1_0/build/Android.bp
index a2d10af..04d2ad2 100644
--- a/automotive/evs/V1_0/build/Android.bp
+++ b/automotive/evs/V1_0/build/Android.bp
@@ -69,10 +69,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.automotive.evs@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -122,7 +120,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.automotive.evs@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/automotive/vehicle/V2_0/build/Android.bp b/automotive/vehicle/V2_0/build/Android.bp
index a96449e..f180122 100644
--- a/automotive/vehicle/V2_0/build/Android.bp
+++ b/automotive/vehicle/V2_0/build/Android.bp
@@ -63,10 +63,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.automotive.vehicle@2.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -112,7 +110,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.automotive.vehicle@2.0",
- "android.hidl.base@1.0",
],
}
diff --git a/automotive/vehicle/V2_1/build/Android.bp b/automotive/vehicle/V2_1/build/Android.bp
index 1dbc4fa..ee7cd78 100644
--- a/automotive/vehicle/V2_1/build/Android.bp
+++ b/automotive/vehicle/V2_1/build/Android.bp
@@ -62,12 +62,10 @@
"android.hardware.automotive.vehicle@2.1",
"android.hardware.automotive.vehicle@2.0",
"android.hardware.automotive.vehicle@2.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.automotive.vehicle@2.0",
"android.hardware.automotive.vehicle@2.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -113,7 +111,6 @@
"android.hardware.automotive.vehicle@2.1",
"android.hardware.automotive.vehicle@2.0",
"android.hardware.automotive.vehicle@2.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/biometrics/fingerprint/V2_1/build/Android.bp b/biometrics/fingerprint/V2_1/build/Android.bp
index 7cc3b75..70a0b1a 100644
--- a/biometrics/fingerprint/V2_1/build/Android.bp
+++ b/biometrics/fingerprint/V2_1/build/Android.bp
@@ -63,10 +63,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.biometrics.fingerprint@2.1",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -112,7 +110,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.biometrics.fingerprint@2.1",
- "android.hidl.base@1.0",
],
}
diff --git a/bluetooth/V1_0/build/Android.bp b/bluetooth/V1_0/build/Android.bp
index d82abbe..425649d 100644
--- a/bluetooth/V1_0/build/Android.bp
+++ b/bluetooth/V1_0/build/Android.bp
@@ -63,10 +63,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.bluetooth@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -108,11 +106,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.bluetooth@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/boot/V1_0/build/Android.bp b/boot/V1_0/build/Android.bp
index 92ef74a..6a557e1 100644
--- a/boot/V1_0/build/Android.bp
+++ b/boot/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.boot@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -103,11 +101,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.boot@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/broadcastradio/V1_0/build/Android.bp b/broadcastradio/V1_0/build/Android.bp
index b3ae706..f395014 100644
--- a/broadcastradio/V1_0/build/Android.bp
+++ b/broadcastradio/V1_0/build/Android.bp
@@ -69,10 +69,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.broadcastradio@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -122,7 +120,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.broadcastradio@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/broadcastradio/V1_1/build/Android.bp b/broadcastradio/V1_1/build/Android.bp
index d1a46e9..ab9284f 100644
--- a/broadcastradio/V1_1/build/Android.bp
+++ b/broadcastradio/V1_1/build/Android.bp
@@ -71,12 +71,10 @@
"android.hardware.broadcastradio@1.1",
"android.hardware.broadcastradio@1.0",
"android.hardware.broadcastradio@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.broadcastradio@1.0",
"android.hardware.broadcastradio@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -128,7 +126,6 @@
"android.hardware.broadcastradio@1.1",
"android.hardware.broadcastradio@1.0",
"android.hardware.broadcastradio@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/camera/device/V1_0/build/Android.bp b/camera/device/V1_0/build/Android.bp
index 2a93a6f..a9ee57e 100644
--- a/camera/device/V1_0/build/Android.bp
+++ b/camera/device/V1_0/build/Android.bp
@@ -70,14 +70,12 @@
"android.hardware.camera.common@1.0-vts.driver",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.camera.common@1.0",
"android.hardware.camera.common@1.0-vts.driver",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -129,7 +127,6 @@
"android.hardware.camera.common@1.0-vts.profiler",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/camera/device/V3_2/build/Android.bp b/camera/device/V3_2/build/Android.bp
index 2b40b6a..884b7c2 100644
--- a/camera/device/V3_2/build/Android.bp
+++ b/camera/device/V3_2/build/Android.bp
@@ -70,14 +70,12 @@
"android.hardware.camera.common@1.0-vts.driver",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.camera.common@1.0",
"android.hardware.camera.common@1.0-vts.driver",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -129,7 +127,6 @@
"android.hardware.camera.common@1.0-vts.profiler",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/camera/provider/V2_4/build/Android.bp b/camera/provider/V2_4/build/Android.bp
index 3c3ca1f..fe73e65 100644
--- a/camera/provider/V2_4/build/Android.bp
+++ b/camera/provider/V2_4/build/Android.bp
@@ -68,7 +68,6 @@
"android.hardware.camera.device@3.2-vts.driver",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.camera.common@1.0",
@@ -79,7 +78,6 @@
"android.hardware.camera.device@3.2-vts.driver",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -131,7 +129,6 @@
"android.hardware.camera.device@3.2-vts.profiler",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/configstore/V1_0/build/Android.bp b/configstore/V1_0/build/Android.bp
index 1c31e7d..a894f74 100644
--- a/configstore/V1_0/build/Android.bp
+++ b/configstore/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.configstore@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -103,11 +101,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.configstore@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/contexthub/V1_0/build/Android.bp b/contexthub/V1_0/build/Android.bp
index 0408b5a..59cc262 100644
--- a/contexthub/V1_0/build/Android.bp
+++ b/contexthub/V1_0/build/Android.bp
@@ -63,10 +63,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.contexthub@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -112,7 +110,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.contexthub@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/drm/V1_0/build/Android.bp b/drm/V1_0/build/Android.bp
index df800bc..c7f6f9f 100644
--- a/drm/V1_0/build/Android.bp
+++ b/drm/V1_0/build/Android.bp
@@ -72,10 +72,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.drm@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -127,7 +125,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.drm@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/dumpstate/V1_0/build/Android.bp b/dumpstate/V1_0/build/Android.bp
index 600e4f0..eea1a99 100644
--- a/dumpstate/V1_0/build/Android.bp
+++ b/dumpstate/V1_0/build/Android.bp
@@ -57,10 +57,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.dumpstate@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -102,7 +100,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.dumpstate@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/gatekeeper/V1_0/build/Android.bp b/gatekeeper/V1_0/build/Android.bp
index acdfcbd..6ba290d 100644
--- a/gatekeeper/V1_0/build/Android.bp
+++ b/gatekeeper/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.gatekeeper@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.gatekeeper@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/gnss/V1_0/build/Android.bp b/gnss/V1_0/build/Android.bp
index 3118d9b..9af2975 100644
--- a/gnss/V1_0/build/Android.bp
+++ b/gnss/V1_0/build/Android.bp
@@ -117,10 +117,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.gnss@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -202,7 +200,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.gnss@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/graphics/allocator/V2_0/build/Android.bp b/graphics/allocator/V2_0/build/Android.bp
index 90b9ad8..ca45f5f 100644
--- a/graphics/allocator/V2_0/build/Android.bp
+++ b/graphics/allocator/V2_0/build/Android.bp
@@ -59,12 +59,10 @@
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@2.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@2.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -108,7 +106,6 @@
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@2.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/graphics/bufferqueue/V1_0/build/Android.bp b/graphics/bufferqueue/V1_0/build/Android.bp
index 22f466f..5ac10c7 100644
--- a/graphics/bufferqueue/V1_0/build/Android.bp
+++ b/graphics/bufferqueue/V1_0/build/Android.bp
@@ -64,14 +64,12 @@
"android.hardware.graphics.common@1.0-vts.driver",
"android.hardware.media@1.0",
"android.hardware.media@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
"android.hardware.media@1.0",
"android.hardware.media@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -119,7 +117,6 @@
"android.hardware.graphics.common@1.0-vts.profiler",
"android.hardware.media@1.0",
"android.hardware.media@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/graphics/composer/V2_1/build/Android.bp b/graphics/composer/V2_1/build/Android.bp
index 48aa08c..92d1900 100644
--- a/graphics/composer/V2_1/build/Android.bp
+++ b/graphics/composer/V2_1/build/Android.bp
@@ -68,12 +68,10 @@
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -123,7 +121,6 @@
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/graphics/mapper/V2_0/build/Android.bp b/graphics/mapper/V2_0/build/Android.bp
index d0727b6..b0e8807 100644
--- a/graphics/mapper/V2_0/build/Android.bp
+++ b/graphics/mapper/V2_0/build/Android.bp
@@ -62,12 +62,10 @@
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -113,7 +111,6 @@
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/health/V1_0/build/Android.bp b/health/V1_0/build/Android.bp
index b0ac344..a7985a0 100644
--- a/health/V1_0/build/Android.bp
+++ b/health/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.health@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.health@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/ir/V1_0/build/Android.bp b/ir/V1_0/build/Android.bp
index 388080f..dd41c8b 100644
--- a/ir/V1_0/build/Android.bp
+++ b/ir/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.ir@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -103,11 +101,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.ir@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/keymaster/V3_0/build/Android.bp b/keymaster/V3_0/build/Android.bp
index e55e946..4097d23 100644
--- a/keymaster/V3_0/build/Android.bp
+++ b/keymaster/V3_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.keymaster@3.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.keymaster@3.0",
- "android.hidl.base@1.0",
],
}
diff --git a/light/V2_0/build/Android.bp b/light/V2_0/build/Android.bp
index cab486f..4e9e037 100644
--- a/light/V2_0/build/Android.bp
+++ b/light/V2_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.light@2.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.light@2.0",
- "android.hidl.base@1.0",
],
}
diff --git a/media/omx/V1_0/build/Android.bp b/media/omx/V1_0/build/Android.bp
index f19e2c3..1334732 100644
--- a/media/omx/V1_0/build/Android.bp
+++ b/media/omx/V1_0/build/Android.bp
@@ -81,7 +81,6 @@
"android.hardware.graphics.common@1.0-vts.driver",
"android.hardware.media@1.0",
"android.hardware.media@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.graphics.bufferqueue@1.0",
@@ -90,7 +89,6 @@
"android.hardware.graphics.common@1.0-vts.driver",
"android.hardware.media@1.0",
"android.hardware.media@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -150,7 +148,6 @@
"android.hardware.graphics.common@1.0-vts.profiler",
"android.hardware.media@1.0",
"android.hardware.media@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/memtrack/V1_0/build/Android.bp b/memtrack/V1_0/build/Android.bp
index 13d064f..491b434 100644
--- a/memtrack/V1_0/build/Android.bp
+++ b/memtrack/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.memtrack@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.memtrack@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/nfc/V1_0/build/Android.bp b/nfc/V1_0/build/Android.bp
index 4f0caf9..29e4dad 100644
--- a/nfc/V1_0/build/Android.bp
+++ b/nfc/V1_0/build/Android.bp
@@ -63,10 +63,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.nfc@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -108,11 +106,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.nfc@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/nfc/V1_0/target_replay/AndroidTest.xml b/nfc/V1_0/target_replay/AndroidTest.xml
index 51ce03c..0f3f80d 100644
--- a/nfc/V1_0/target_replay/AndroidTest.xml
+++ b/nfc/V1_0/target_replay/AndroidTest.xml
@@ -28,8 +28,8 @@
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsHalNfcV1_0TargetReplay"/>
<option name="binary-test-type" value="hal_hidl_replay_test"/>
- <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/nfc/V1_0/android.hardware.nfc@1.0_sailfish_2.vts.trace"/>
- <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/nfc/V1_0/android.hardware.nfc@1.0_sailfish_1.vts.trace"/>
+ <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/nfc/V1_0/android.hardware.nfc_1.0_17270843854.vts.trace"/>
+ <option name="hal-hidl-replay-test-trace-path" value="test/vts-testcase/hal-trace/nfc/V1_0/android.hardware.nfc_1.0_17261139999.vts.trace"/>
<option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>
<option name="precondition-lshal" value="android.hardware.nfc@1.0"/>
<option name="test-timeout" value="3m"/>
diff --git a/power/V1_0/build/Android.bp b/power/V1_0/build/Android.bp
index 6ca778d..47973bf 100644
--- a/power/V1_0/build/Android.bp
+++ b/power/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.power@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.power@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/radio/V1_0/build/Android.bp b/radio/V1_0/build/Android.bp
index 0b9d4c7..324ea56 100644
--- a/radio/V1_0/build/Android.bp
+++ b/radio/V1_0/build/Android.bp
@@ -72,10 +72,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.radio@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -123,11 +121,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.radio@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/radio/deprecated/V1_0/build/Android.bp b/radio/deprecated/V1_0/build/Android.bp
index ae76eb3..01ab26d 100644
--- a/radio/deprecated/V1_0/build/Android.bp
+++ b/radio/deprecated/V1_0/build/Android.bp
@@ -65,12 +65,10 @@
"android.hardware.radio.deprecated@1.0",
"android.hardware.radio@1.0",
"android.hardware.radio@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.radio@1.0",
"android.hardware.radio@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -112,13 +110,13 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.radio.deprecated@1.0",
"android.hardware.radio@1.0",
"android.hardware.radio@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/renderscript/V1_0/build/Android.bp b/renderscript/V1_0/build/Android.bp
index ed07378..4f55df2 100644
--- a/renderscript/V1_0/build/Android.bp
+++ b/renderscript/V1_0/build/Android.bp
@@ -63,10 +63,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.renderscript@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -108,11 +106,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.renderscript@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/renderscript/V1_0/target_profiling/Android.mk b/renderscript/V1_0/target_profiling/Android.mk
new file mode 100644
index 0000000..fcf1e57
--- /dev/null
+++ b/renderscript/V1_0/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 := VtsHalRenderscriptV1_0TargetProfiling
+VTS_CONFIG_SRC_DIR := testcases/hal/renderscript/V1_0/target_profiling
+include test/vts/tools/build/Android.host_config.mk
diff --git a/renderscript/V1_0/target_profiling/AndroidTest.xml b/renderscript/V1_0/target_profiling/AndroidTest.xml
new file mode 100644
index 0000000..63fc254
--- /dev/null
+++ b/renderscript/V1_0/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 VtsHalRenderscriptV1_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="HalHidlTargetProfilingTest.push"/>
+ <option name="cleanup" value="true"/>
+ <option name="push" value="DATA/lib/android.hardware.renderscript@1.0-vts.profiler.so->/data/local/tmp/32/android.hardware.renderscript@1.0-vts.profiler.so"/>
+ <option name="push" value="DATA/lib64/android.hardware.renderscript@1.0-vts.profiler.so->/data/local/tmp/64/android.hardware.renderscript@1.0-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="VtsHalRenderscriptV1_0TargetProfiling"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalRenderscriptV1_0TargetTest/VtsHalRenderscriptV1_0TargetTest"/>
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalRenderscriptV1_0TargetTest/VtsHalRenderscriptV1_0TargetTest"/>
+ <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.renderscript@1.0"/>
+ <option name="test-timeout" value="1m"/>
+ </test>
+</configuration>
diff --git a/script/build/build_rule_gen.py b/script/build/build_rule_gen.py
old mode 100644
new mode 100755
index a3b72c2..afcf5ad
--- a/script/build/build_rule_gen.py
+++ b/script/build/build_rule_gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.4
+#!/usr/bin/env python
#
# Copyright (C) 2017 The Android Open Source Project
#
@@ -168,6 +168,9 @@
"""
result = []
for package in imported_packages:
+ if package in ["android.hidl.base@1.0",
+ "android.hidl.manager@1.0"]:
+ continue
prefix = 'android.hardware.'
if package.startswith(prefix):
# TODO(b/36475863)
diff --git a/script/build/template/vts_build_template.bp b/script/build/template/vts_build_template.bp
index bf474b4..bc95f40 100644
--- a/script/build/template/vts_build_template.bp
+++ b/script/build/template/vts_build_template.bp
@@ -95,6 +95,7 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
diff --git a/script/update_hal_tests.py b/script/update_hal_tests.py
new file mode 100755
index 0000000..733254a
--- /dev/null
+++ b/script/update_hal_tests.py
@@ -0,0 +1,111 @@
+#!/usr/bin/env python
+#
+# Copyright 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.
+#
+
+import argparse
+import os
+import re
+import sys
+
+from configure.test_case_creator import TestCaseCreator
+from build.vts_spec_parser import VtsSpecParser
+"""Regenerate test configures for all existing tests.
+
+Usage:
+ python update_hal_tests.py
+"""
+
+
+def GetTimeOut(configure_path):
+ """Get the timeout settings from the original configure.
+
+ Args:
+ configure_path: path of the original configure file.
+
+ Returns:
+ timeout values.
+ """
+ time_out = "1m"
+ configure_file = open(configure_path, "r")
+ for line in configure_file.readlines():
+ if "test-timeout" in line:
+ temp = line[(line.find("value") + 7):]
+ time_out = temp[0:temp.find('"')]
+ break
+ return time_out
+
+
+def GetDisableRunTime(configure_path):
+ """Get the stop runtime settings from the original configure.
+
+ Args:
+ configure_path: path of the original configure file.
+
+ Returns:
+ Settings about whether to stop runtime before test.
+ """
+ disable_runtime = False
+ configure_file = open(configure_path, "r")
+ for line in configure_file.readlines():
+ if "binary-test-disable-framework" in line:
+ disable_runtime = True
+ break
+ return disable_runtime
+
+
+test_categories = {
+ 'target': ('target/AndroidTest.xml', 'target', False),
+ 'target_profiling': ('target_profiling/AndroidTest.xml', 'target', True),
+ 'host': ('host/AndroidTest.xml', 'host', False),
+ 'host_profiling': ('host_profiling/AndroidTest.xml', 'host', True),
+}
+
+
+def main():
+ build_top = os.getenv('ANDROID_BUILD_TOP')
+ if not build_top:
+ print('Error: Missing ANDROID_BUILD_TOP env variable. Please run '
+ '\'. build/envsetup.sh; lunch <build target>\' Exiting...')
+ sys.exit(1)
+
+ vts_spec_parser = VtsSpecParser()
+ hal_list = vts_spec_parser.HalNamesAndVersions()
+
+ for hal_name, hal_version in hal_list:
+ hal_package_name = 'android.hardware.' + hal_name + '@' + hal_version
+ test_case_creater = TestCaseCreator(vts_spec_parser, hal_package_name)
+ hal_path = hal_name.replace(".", "/")
+ hal_version_str = 'V' + hal_version.replace('.', '_')
+ hal_test_path = os.path.join(build_top, 'test/vts-testcase/hal',
+ hal_path, hal_version_str)
+
+ for test_categry, configure in test_categories.iteritems():
+ print test_categry
+ print configure
+ test_configure_path = os.path.join(hal_test_path, configure[0])
+ if os.path.exists(test_configure_path):
+ time_out = GetTimeOut(test_configure_path)
+ stop_runtime = GetDisableRunTime(test_configure_path)
+ test_case_creater.LaunchTestCase(
+ configure[1],
+ time_out=time_out,
+ is_profiling=configure[2],
+ stop_runtime=stop_runtime,
+ update_only=True)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/sensors/V1_0/build/Android.bp b/sensors/V1_0/build/Android.bp
index a8b6236..338c7ae 100644
--- a/sensors/V1_0/build/Android.bp
+++ b/sensors/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.sensors@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.sensors@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/soundtrigger/V2_0/build/Android.bp b/soundtrigger/V2_0/build/Android.bp
index 9fe9b0a..d2cef22 100644
--- a/soundtrigger/V2_0/build/Android.bp
+++ b/soundtrigger/V2_0/build/Android.bp
@@ -65,12 +65,10 @@
"android.hardware.soundtrigger@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -118,7 +116,6 @@
"android.hardware.soundtrigger@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/bar/V1_0/build/Android.bp b/tests/bar/V1_0/build/Android.bp
index 5d90f04..1b109d9 100644
--- a/tests/bar/V1_0/build/Android.bp
+++ b/tests/bar/V1_0/build/Android.bp
@@ -74,12 +74,10 @@
"android.hardware.tests.bar@1.0",
"android.hardware.tests.foo@1.0",
"android.hardware.tests.foo@1.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.tests.foo@1.0",
"android.hardware.tests.foo@1.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -127,13 +125,13 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.bar@1.0",
"android.hardware.tests.foo@1.0",
"android.hardware.tests.foo@1.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/baz/V1_0/build/Android.bp b/tests/baz/V1_0/build/Android.bp
index 9bab25d..eb31b8f 100644
--- a/tests/baz/V1_0/build/Android.bp
+++ b/tests/baz/V1_0/build/Android.bp
@@ -69,10 +69,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.baz@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -118,11 +116,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.baz@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/expression/V1_0/build/Android.bp b/tests/expression/V1_0/build/Android.bp
index f273d81..b5162bb 100644
--- a/tests/expression/V1_0/build/Android.bp
+++ b/tests/expression/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.expression@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -103,11 +101,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.expression@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/extension/light/V2_0/build/Android.bp b/tests/extension/light/V2_0/build/Android.bp
index bb45d2c..7ed4648 100644
--- a/tests/extension/light/V2_0/build/Android.bp
+++ b/tests/extension/light/V2_0/build/Android.bp
@@ -62,12 +62,10 @@
"android.hardware.tests.extension.light@2.0",
"android.hardware.light@2.0",
"android.hardware.light@2.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.light@2.0",
"android.hardware.light@2.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -113,7 +111,6 @@
"android.hardware.tests.extension.light@2.0",
"android.hardware.light@2.0",
"android.hardware.light@2.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/foo/V1_0/build/Android.bp b/tests/foo/V1_0/build/Android.bp
index a80cf76..724e122 100644
--- a/tests/foo/V1_0/build/Android.bp
+++ b/tests/foo/V1_0/build/Android.bp
@@ -72,10 +72,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.foo@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -123,11 +121,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.foo@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/hash/V1_0/build/Android.bp b/tests/hash/V1_0/build/Android.bp
index bf4c8ad..a0fa950 100644
--- a/tests/hash/V1_0/build/Android.bp
+++ b/tests/hash/V1_0/build/Android.bp
@@ -57,10 +57,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.hash@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -102,7 +100,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.hash@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/inheritance/V1_0/build/Android.bp b/tests/inheritance/V1_0/build/Android.bp
index 084a5db..fbdd91a 100644
--- a/tests/inheritance/V1_0/build/Android.bp
+++ b/tests/inheritance/V1_0/build/Android.bp
@@ -66,10 +66,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.inheritance@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -113,11 +111,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.inheritance@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/libhwbinder/V1_0/build/Android.bp b/tests/libhwbinder/V1_0/build/Android.bp
index ed7430f..6e36fac 100644
--- a/tests/libhwbinder/V1_0/build/Android.bp
+++ b/tests/libhwbinder/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.libhwbinder@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -103,11 +101,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.libhwbinder@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/memory/V1_0/build/Android.bp b/tests/memory/V1_0/build/Android.bp
index 625b270..4463f0e 100644
--- a/tests/memory/V1_0/build/Android.bp
+++ b/tests/memory/V1_0/build/Android.bp
@@ -57,10 +57,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.memory@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -98,11 +96,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.memory@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/msgq/V1_0/build/Android.bp b/tests/msgq/V1_0/build/Android.bp
index fc6f8c0..ae49f01 100644
--- a/tests/msgq/V1_0/build/Android.bp
+++ b/tests/msgq/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.msgq@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -103,11 +101,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.msgq@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/pointer/V1_0/build/Android.bp b/tests/pointer/V1_0/build/Android.bp
index 5605206..94000c4 100644
--- a/tests/pointer/V1_0/build/Android.bp
+++ b/tests/pointer/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.pointer@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -103,11 +101,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.pointer@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/versioning/V1_0/build/Android.bp b/tests/versioning/V1_0/build/Android.bp
index f134d45..7c320e1 100644
--- a/tests/versioning/V1_0/build/Android.bp
+++ b/tests/versioning/V1_0/build/Android.bp
@@ -57,10 +57,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.versioning@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -98,11 +96,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.versioning@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/versioning/V2_2/build/Android.bp b/tests/versioning/V2_2/build/Android.bp
index 7593a60..25dbd44 100644
--- a/tests/versioning/V2_2/build/Android.bp
+++ b/tests/versioning/V2_2/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tests.versioning@2.2",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -103,11 +101,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tests.versioning@2.2",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/versioning/V2_3/build/Android.bp b/tests/versioning/V2_3/build/Android.bp
index c24b9e7..1985ed4 100644
--- a/tests/versioning/V2_3/build/Android.bp
+++ b/tests/versioning/V2_3/build/Android.bp
@@ -67,14 +67,12 @@
"android.hardware.tests.versioning@1.0-vts.driver",
"android.hardware.tests.versioning@2.2",
"android.hardware.tests.versioning@2.2-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.tests.versioning@1.0",
"android.hardware.tests.versioning@1.0-vts.driver",
"android.hardware.tests.versioning@2.2",
"android.hardware.tests.versioning@2.2-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -116,6 +114,7 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
@@ -124,7 +123,6 @@
"android.hardware.tests.versioning@1.0-vts.profiler",
"android.hardware.tests.versioning@2.2",
"android.hardware.tests.versioning@2.2-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/tests/versioning/V2_4/build/Android.bp b/tests/versioning/V2_4/build/Android.bp
index 1a83f31..ca51fa2 100644
--- a/tests/versioning/V2_4/build/Android.bp
+++ b/tests/versioning/V2_4/build/Android.bp
@@ -61,14 +61,12 @@
"android.hardware.tests.versioning@2.2-vts.driver",
"android.hardware.tests.versioning@2.3",
"android.hardware.tests.versioning@2.3-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.tests.versioning@2.2",
"android.hardware.tests.versioning@2.2-vts.driver",
"android.hardware.tests.versioning@2.3",
"android.hardware.tests.versioning@2.3-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -106,6 +104,7 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
@@ -114,7 +113,6 @@
"android.hardware.tests.versioning@2.2-vts.profiler",
"android.hardware.tests.versioning@2.3",
"android.hardware.tests.versioning@2.3-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/thermal/V1_0/build/Android.bp b/thermal/V1_0/build/Android.bp
index 1fd9dd9..5fd63ec 100644
--- a/thermal/V1_0/build/Android.bp
+++ b/thermal/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.thermal@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.thermal@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/treble/vintf/Android.bp b/treble/vintf/Android.bp
index bbf9107..f151f3e 100644
--- a/treble/vintf/Android.bp
+++ b/treble/vintf/Android.bp
@@ -26,7 +26,6 @@
"libhidl-gen-hash",
"libhidl-gen-utils",
"libvintf",
- "android.hidl.manager@1.0",
],
}
diff --git a/tv/cec/V1_0/build/Android.bp b/tv/cec/V1_0/build/Android.bp
index 1e8265a..8ced856 100644
--- a/tv/cec/V1_0/build/Android.bp
+++ b/tv/cec/V1_0/build/Android.bp
@@ -63,10 +63,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.tv.cec@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -112,7 +110,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.tv.cec@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/tv/input/V1_0/build/Android.bp b/tv/input/V1_0/build/Android.bp
index d9bb7bf..25a7d69 100644
--- a/tv/input/V1_0/build/Android.bp
+++ b/tv/input/V1_0/build/Android.bp
@@ -65,12 +65,10 @@
"android.hardware.tv.input@1.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
- "android.hidl.base@1.0",
],
}
@@ -118,7 +116,6 @@
"android.hardware.tv.input@1.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.profiler",
- "android.hidl.base@1.0",
],
}
diff --git a/usb/V1_0/build/Android.bp b/usb/V1_0/build/Android.bp
index 9911089..1477850 100644
--- a/usb/V1_0/build/Android.bp
+++ b/usb/V1_0/build/Android.bp
@@ -63,10 +63,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.usb@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -112,7 +110,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.usb@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/vibrator/V1_0/build/Android.bp b/vibrator/V1_0/build/Android.bp
index a314c7c..9ac66d4 100644
--- a/vibrator/V1_0/build/Android.bp
+++ b/vibrator/V1_0/build/Android.bp
@@ -60,10 +60,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.vibrator@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -107,7 +105,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.vibrator@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/vr/V1_0/build/Android.bp b/vr/V1_0/build/Android.bp
index cac6326..95f1353 100644
--- a/vr/V1_0/build/Android.bp
+++ b/vr/V1_0/build/Android.bp
@@ -57,10 +57,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.vr@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -102,7 +100,6 @@
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.vr@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/wifi/V1_0/build/Android.bp b/wifi/V1_0/build/Android.bp
index 69f070c..bb34416 100644
--- a/wifi/V1_0/build/Android.bp
+++ b/wifi/V1_0/build/Android.bp
@@ -96,10 +96,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.wifi@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -163,11 +161,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.wifi@1.0",
- "android.hidl.base@1.0",
],
}
diff --git a/wifi/supplicant/V1_0/build/Android.bp b/wifi/supplicant/V1_0/build/Android.bp
index 169634a..edb3b23 100644
--- a/wifi/supplicant/V1_0/build/Android.bp
+++ b/wifi/supplicant/V1_0/build/Android.bp
@@ -93,10 +93,8 @@
"libcamera_metadata",
"libprotobuf-cpp-full",
"android.hardware.wifi.supplicant@1.0",
- "android.hidl.base@1.0",
],
export_shared_lib_headers: [
- "android.hidl.base@1.0",
],
}
@@ -158,11 +156,11 @@
"libbase",
"libhidlbase",
"libhidltransport",
+ "libvts_common",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hardware.wifi.supplicant@1.0",
- "android.hidl.base@1.0",
],
}