Merge "Update build rule for vts driver."
diff --git a/audio/V2_0/build/Android.bp b/audio/V2_0/build/Android.bp
index e3edbaa..0a50416 100644
--- a/audio/V2_0/build/Android.bp
+++ b/audio/V2_0/build/Android.bp
@@ -64,19 +64,21 @@
generated_headers: ["android.hardware.audio@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.audio@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.audio@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
diff --git a/audio/common/V2_0/build/Android.bp b/audio/common/V2_0/build/Android.bp
index a2031f7..485b349 100644
--- a/audio/common/V2_0/build/Android.bp
+++ b/audio/common/V2_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.audio.common@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.audio.common@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.audio.common@2.0",
],
diff --git a/audio/effect/V2_0/build/Android.bp b/audio/effect/V2_0/build/Android.bp
index 171067d..1a439b5 100644
--- a/audio/effect/V2_0/build/Android.bp
+++ b/audio/effect/V2_0/build/Android.bp
@@ -85,19 +85,21 @@
generated_headers: ["android.hardware.audio.effect@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.audio.effect@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.audio.effect@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
diff --git a/automotive/evs/V1_0/build/Android.bp b/automotive/evs/V1_0/build/Android.bp
index 99b2c16..694cc80 100644
--- a/automotive/evs/V1_0/build/Android.bp
+++ b/automotive/evs/V1_0/build/Android.bp
@@ -55,19 +55,21 @@
generated_headers: ["android.hardware.automotive.evs@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.automotive.evs@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.automotive.evs@1.0",
],
diff --git a/automotive/vehicle/V2_0/build/Android.bp b/automotive/vehicle/V2_0/build/Android.bp
index c3814a0..4054b7c 100644
--- a/automotive/vehicle/V2_0/build/Android.bp
+++ b/automotive/vehicle/V2_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.automotive.vehicle@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.automotive.vehicle@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.automotive.vehicle@2.0",
],
diff --git a/automotive/vehicle/V2_1/build/Android.bp b/automotive/vehicle/V2_1/build/Android.bp
index abe91bd..ed24785 100644
--- a/automotive/vehicle/V2_1/build/Android.bp
+++ b/automotive/vehicle/V2_1/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.automotive.vehicle@2.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.automotive.vehicle@2.1-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.automotive.vehicle@2.1",
"android.hardware.automotive.vehicle@2.0",
"android.hardware.automotive.vehicle@2.0-vts.driver",
diff --git a/biometrics/fingerprint/V2_1/build/Android.bp b/biometrics/fingerprint/V2_1/build/Android.bp
index 0839065..8ab1ab4 100644
--- a/biometrics/fingerprint/V2_1/build/Android.bp
+++ b/biometrics/fingerprint/V2_1/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.biometrics.fingerprint@2.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.biometrics.fingerprint@2.1",
],
diff --git a/bluetooth/V1_0/build/Android.bp b/bluetooth/V1_0/build/Android.bp
index b55554b..9d263bd 100644
--- a/bluetooth/V1_0/build/Android.bp
+++ b/bluetooth/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.bluetooth@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.bluetooth@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.bluetooth@1.0",
],
diff --git a/boot/V1_0/build/Android.bp b/boot/V1_0/build/Android.bp
index 0a969ca..f3cf3da 100644
--- a/boot/V1_0/build/Android.bp
+++ b/boot/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.boot@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.boot@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.boot@1.0",
],
diff --git a/broadcastradio/V1_0/build/Android.bp b/broadcastradio/V1_0/build/Android.bp
index 0fff739..286b693 100644
--- a/broadcastradio/V1_0/build/Android.bp
+++ b/broadcastradio/V1_0/build/Android.bp
@@ -55,19 +55,21 @@
generated_headers: ["android.hardware.broadcastradio@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.broadcastradio@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.broadcastradio@1.0",
],
diff --git a/broadcastradio/V1_1/build/Android.bp b/broadcastradio/V1_1/build/Android.bp
index 1a6ed1f..dd33221 100644
--- a/broadcastradio/V1_1/build/Android.bp
+++ b/broadcastradio/V1_1/build/Android.bp
@@ -55,19 +55,21 @@
generated_headers: ["android.hardware.broadcastradio@1.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.broadcastradio@1.1-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.broadcastradio@1.1",
"android.hardware.broadcastradio@1.0",
"android.hardware.broadcastradio@1.0-vts.driver",
diff --git a/camera/common/V1_0/build/Android.bp b/camera/common/V1_0/build/Android.bp
index ccd919b..3af91a2 100644
--- a/camera/common/V1_0/build/Android.bp
+++ b/camera/common/V1_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.camera.common@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.camera.common@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.camera.common@1.0",
],
diff --git a/camera/device/V1_0/build/Android.bp b/camera/device/V1_0/build/Android.bp
index e470fe0..c0cac42 100644
--- a/camera/device/V1_0/build/Android.bp
+++ b/camera/device/V1_0/build/Android.bp
@@ -52,19 +52,21 @@
generated_headers: ["android.hardware.camera.device@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.camera.device@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.camera.device@1.0",
"android.hardware.camera.common@1.0",
"android.hardware.camera.common@1.0-vts.driver",
diff --git a/camera/device/V3_2/build/Android.bp b/camera/device/V3_2/build/Android.bp
index fddb9f0..62ac728 100644
--- a/camera/device/V3_2/build/Android.bp
+++ b/camera/device/V3_2/build/Android.bp
@@ -52,19 +52,21 @@
generated_headers: ["android.hardware.camera.device@3.2-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.camera.device@3.2-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.camera.device@3.2",
"android.hardware.camera.common@1.0",
"android.hardware.camera.common@1.0-vts.driver",
diff --git a/camera/metadata/V3_2/build/Android.bp b/camera/metadata/V3_2/build/Android.bp
index 4c387f2..96bffd4 100644
--- a/camera/metadata/V3_2/build/Android.bp
+++ b/camera/metadata/V3_2/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.camera.metadata@3.2-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.camera.metadata@3.2-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.camera.metadata@3.2",
],
diff --git a/camera/provider/V2_4/build/Android.bp b/camera/provider/V2_4/build/Android.bp
index 9f77c2e..b4b28da 100644
--- a/camera/provider/V2_4/build/Android.bp
+++ b/camera/provider/V2_4/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.camera.provider@2.4-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.camera.provider@2.4-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.camera.provider@2.4",
"android.hardware.camera.common@1.0",
"android.hardware.camera.common@1.0-vts.driver",
diff --git a/configstore/V1_0/build/Android.bp b/configstore/V1_0/build/Android.bp
index d1fdc5b..26fec59 100644
--- a/configstore/V1_0/build/Android.bp
+++ b/configstore/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.configstore@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.configstore@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.configstore@1.0",
],
diff --git a/contexthub/V1_0/build/Android.bp b/contexthub/V1_0/build/Android.bp
index 49e2865..9a16c0a 100644
--- a/contexthub/V1_0/build/Android.bp
+++ b/contexthub/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.contexthub@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.contexthub@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.contexthub@1.0",
],
diff --git a/drm/V1_0/build/Android.bp b/drm/V1_0/build/Android.bp
index 06b0ed6..729cc45 100644
--- a/drm/V1_0/build/Android.bp
+++ b/drm/V1_0/build/Android.bp
@@ -58,19 +58,21 @@
generated_headers: ["android.hardware.drm@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.drm@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.drm@1.0",
],
diff --git a/dumpstate/V1_0/build/Android.bp b/dumpstate/V1_0/build/Android.bp
index 3219d05..6da14ea 100644
--- a/dumpstate/V1_0/build/Android.bp
+++ b/dumpstate/V1_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.dumpstate@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.dumpstate@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.dumpstate@1.0",
],
diff --git a/gatekeeper/V1_0/build/Android.bp b/gatekeeper/V1_0/build/Android.bp
index 73dd7a8..c566980 100644
--- a/gatekeeper/V1_0/build/Android.bp
+++ b/gatekeeper/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.gatekeeper@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.gatekeeper@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.gatekeeper@1.0",
],
diff --git a/gnss/V1_0/build/Android.bp b/gnss/V1_0/build/Android.bp
index 23553ff..214de8b 100644
--- a/gnss/V1_0/build/Android.bp
+++ b/gnss/V1_0/build/Android.bp
@@ -103,19 +103,21 @@
generated_headers: ["android.hardware.gnss@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.gnss@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.gnss@1.0",
],
diff --git a/graphics/allocator/V2_0/build/Android.bp b/graphics/allocator/V2_0/build/Android.bp
index 21237ce..b442eef 100644
--- a/graphics/allocator/V2_0/build/Android.bp
+++ b/graphics/allocator/V2_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.graphics.allocator@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.allocator@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@2.0-vts.driver",
diff --git a/graphics/bufferqueue/V1_0/build/Android.bp b/graphics/bufferqueue/V1_0/build/Android.bp
index 04b0b54..512dfa9 100644
--- a/graphics/bufferqueue/V1_0/build/Android.bp
+++ b/graphics/bufferqueue/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.graphics.bufferqueue@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.bufferqueue@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.graphics.bufferqueue@1.0",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
diff --git a/graphics/common/V1_0/build/Android.bp b/graphics/common/V1_0/build/Android.bp
index 9632af7..07d50dc 100644
--- a/graphics/common/V1_0/build/Android.bp
+++ b/graphics/common/V1_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.graphics.common@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.common@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.graphics.common@1.0",
],
diff --git a/graphics/composer/V2_1/build/Android.bp b/graphics/composer/V2_1/build/Android.bp
index d49e253..8014599 100644
--- a/graphics/composer/V2_1/build/Android.bp
+++ b/graphics/composer/V2_1/build/Android.bp
@@ -52,19 +52,21 @@
generated_headers: ["android.hardware.graphics.composer@2.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.composer@2.1-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
diff --git a/graphics/mapper/V2_0/build/Android.bp b/graphics/mapper/V2_0/build/Android.bp
index ca04058..1707a07 100644
--- a/graphics/mapper/V2_0/build/Android.bp
+++ b/graphics/mapper/V2_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.graphics.mapper@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.graphics.mapper@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
diff --git a/health/V1_0/build/Android.bp b/health/V1_0/build/Android.bp
index ecafb4b..2e621ce 100644
--- a/health/V1_0/build/Android.bp
+++ b/health/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.health@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.health@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.health@1.0",
],
diff --git a/ir/V1_0/build/Android.bp b/ir/V1_0/build/Android.bp
index 09c3ff5..b2e9e7c 100644
--- a/ir/V1_0/build/Android.bp
+++ b/ir/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.ir@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.ir@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.ir@1.0",
],
diff --git a/keymaster/V3_0/build/Android.bp b/keymaster/V3_0/build/Android.bp
index ba1f33e..055a2e6 100644
--- a/keymaster/V3_0/build/Android.bp
+++ b/keymaster/V3_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.keymaster@3.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.keymaster@3.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.keymaster@3.0",
],
diff --git a/light/V2_0/build/Android.bp b/light/V2_0/build/Android.bp
index cec4ac1..b4cfd7e 100644
--- a/light/V2_0/build/Android.bp
+++ b/light/V2_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.light@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.light@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.light@2.0",
],
diff --git a/media/V1_0/build/Android.bp b/media/V1_0/build/Android.bp
index abd8e7f..2354adf 100644
--- a/media/V1_0/build/Android.bp
+++ b/media/V1_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.media@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.media@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.media@1.0",
"android.hardware.graphics.common@1.0",
"android.hardware.graphics.common@1.0-vts.driver",
diff --git a/media/omx/V1_0/build/Android.bp b/media/omx/V1_0/build/Android.bp
index f44cd00..7308f9d 100644
--- a/media/omx/V1_0/build/Android.bp
+++ b/media/omx/V1_0/build/Android.bp
@@ -61,19 +61,21 @@
generated_headers: ["android.hardware.media.omx@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.media.omx@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.media.omx@1.0",
"android.hardware.graphics.bufferqueue@1.0",
"android.hardware.graphics.bufferqueue@1.0-vts.driver",
diff --git a/memtrack/V1_0/build/Android.bp b/memtrack/V1_0/build/Android.bp
index 2fd215b..1801bf8 100644
--- a/memtrack/V1_0/build/Android.bp
+++ b/memtrack/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.memtrack@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.memtrack@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.memtrack@1.0",
],
diff --git a/nfc/V1_0/build/Android.bp b/nfc/V1_0/build/Android.bp
index 195947a..da4c32b 100644
--- a/nfc/V1_0/build/Android.bp
+++ b/nfc/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.nfc@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.nfc@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.nfc@1.0",
],
diff --git a/power/V1_0/build/Android.bp b/power/V1_0/build/Android.bp
index a8ce955..32dc0f7 100644
--- a/power/V1_0/build/Android.bp
+++ b/power/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.power@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.power@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.power@1.0",
],
diff --git a/radio/V1_0/build/Android.bp b/radio/V1_0/build/Android.bp
index 0df8a75..3910e1e 100644
--- a/radio/V1_0/build/Android.bp
+++ b/radio/V1_0/build/Android.bp
@@ -58,19 +58,21 @@
generated_headers: ["android.hardware.radio@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.radio@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.radio@1.0",
],
diff --git a/radio/V1_1/build/Android.bp b/radio/V1_1/build/Android.bp
index 99a43e6..ce9800c 100644
--- a/radio/V1_1/build/Android.bp
+++ b/radio/V1_1/build/Android.bp
@@ -52,19 +52,21 @@
generated_headers: ["android.hardware.radio@1.1-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.radio@1.1-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.radio@1.1",
"android.hardware.radio@1.0",
"android.hardware.radio@1.0-vts.driver",
diff --git a/radio/deprecated/V1_0/build/Android.bp b/radio/deprecated/V1_0/build/Android.bp
index 8c8dcd3..026ef95 100644
--- a/radio/deprecated/V1_0/build/Android.bp
+++ b/radio/deprecated/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.radio.deprecated@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.radio.deprecated@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.radio.deprecated@1.0",
"android.hardware.radio@1.0",
"android.hardware.radio@1.0-vts.driver",
diff --git a/renderscript/V1_0/build/Android.bp b/renderscript/V1_0/build/Android.bp
index a92d88d..ebc0450 100644
--- a/renderscript/V1_0/build/Android.bp
+++ b/renderscript/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.renderscript@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.renderscript@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.renderscript@1.0",
],
diff --git a/script/build/template/vts_build_template.bp b/script/build/template/vts_build_template.bp
index 25d855b..0bd41e2 100644
--- a/script/build/template/vts_build_template.bp
+++ b/script/build/template/vts_build_template.bp
@@ -40,19 +40,21 @@
generated_headers: ["android.hardware.{HAL_NAME}@{HAL_VERSION}-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.{HAL_NAME}@{HAL_VERSION}-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.{HAL_NAME}@{HAL_VERSION}",
{IMPORTED_DRIVER_PACKAGES}
],
diff --git a/sensors/V1_0/build/Android.bp b/sensors/V1_0/build/Android.bp
index de48b4c..5824821 100644
--- a/sensors/V1_0/build/Android.bp
+++ b/sensors/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.sensors@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.sensors@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.sensors@1.0",
],
diff --git a/soundtrigger/V2_0/build/Android.bp b/soundtrigger/V2_0/build/Android.bp
index 0290907..d339e88 100644
--- a/soundtrigger/V2_0/build/Android.bp
+++ b/soundtrigger/V2_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.soundtrigger@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.soundtrigger@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.soundtrigger@2.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
diff --git a/tests/bar/V1_0/build/Android.bp b/tests/bar/V1_0/build/Android.bp
index ab0c744..63e4cf9 100644
--- a/tests/bar/V1_0/build/Android.bp
+++ b/tests/bar/V1_0/build/Android.bp
@@ -58,19 +58,21 @@
generated_headers: ["android.hardware.tests.bar@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.bar@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.bar@1.0",
"android.hardware.tests.foo@1.0",
"android.hardware.tests.foo@1.0-vts.driver",
diff --git a/tests/baz/V1_0/build/Android.bp b/tests/baz/V1_0/build/Android.bp
index 38f28aa..7ef1b8d 100644
--- a/tests/baz/V1_0/build/Android.bp
+++ b/tests/baz/V1_0/build/Android.bp
@@ -55,19 +55,21 @@
generated_headers: ["android.hardware.tests.baz@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.baz@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.baz@1.0",
],
diff --git a/tests/expression/V1_0/build/Android.bp b/tests/expression/V1_0/build/Android.bp
index a98ab96..7ecb5b6 100644
--- a/tests/expression/V1_0/build/Android.bp
+++ b/tests/expression/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.tests.expression@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.expression@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.expression@1.0",
],
diff --git a/tests/extension/light/V2_0/build/Android.bp b/tests/extension/light/V2_0/build/Android.bp
index 997bb7b..3a06f75 100644
--- a/tests/extension/light/V2_0/build/Android.bp
+++ b/tests/extension/light/V2_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.tests.extension.light@2.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.extension.light@2.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.extension.light@2.0",
"android.hardware.light@2.0",
"android.hardware.light@2.0-vts.driver",
diff --git a/tests/foo/V1_0/build/Android.bp b/tests/foo/V1_0/build/Android.bp
index 3ee0f80..87377e0 100644
--- a/tests/foo/V1_0/build/Android.bp
+++ b/tests/foo/V1_0/build/Android.bp
@@ -58,19 +58,21 @@
generated_headers: ["android.hardware.tests.foo@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.foo@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.foo@1.0",
],
diff --git a/tests/hash/V1_0/build/Android.bp b/tests/hash/V1_0/build/Android.bp
index 0a28dcc..0998e6a 100644
--- a/tests/hash/V1_0/build/Android.bp
+++ b/tests/hash/V1_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.tests.hash@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.hash@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.hash@1.0",
],
diff --git a/tests/inheritance/V1_0/build/Android.bp b/tests/inheritance/V1_0/build/Android.bp
index f3ffe60..56acaa6 100644
--- a/tests/inheritance/V1_0/build/Android.bp
+++ b/tests/inheritance/V1_0/build/Android.bp
@@ -52,19 +52,21 @@
generated_headers: ["android.hardware.tests.inheritance@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.inheritance@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.inheritance@1.0",
],
diff --git a/tests/libhwbinder/V1_0/build/Android.bp b/tests/libhwbinder/V1_0/build/Android.bp
index 9cbc910..2a47be3 100644
--- a/tests/libhwbinder/V1_0/build/Android.bp
+++ b/tests/libhwbinder/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.tests.libhwbinder@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.libhwbinder@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.libhwbinder@1.0",
],
diff --git a/tests/memory/V1_0/build/Android.bp b/tests/memory/V1_0/build/Android.bp
index 5505bca..e4d3bc6 100644
--- a/tests/memory/V1_0/build/Android.bp
+++ b/tests/memory/V1_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.tests.memory@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.memory@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.memory@1.0",
],
diff --git a/tests/msgq/V1_0/build/Android.bp b/tests/msgq/V1_0/build/Android.bp
index a1b03e4..9f46d0d 100644
--- a/tests/msgq/V1_0/build/Android.bp
+++ b/tests/msgq/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.tests.msgq@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.msgq@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.msgq@1.0",
],
diff --git a/tests/pointer/V1_0/build/Android.bp b/tests/pointer/V1_0/build/Android.bp
index 26eddc6..3c056da 100644
--- a/tests/pointer/V1_0/build/Android.bp
+++ b/tests/pointer/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.tests.pointer@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.pointer@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tests.pointer@1.0",
],
diff --git a/tetheroffload/config/V1_0/build/Android.bp b/tetheroffload/config/V1_0/build/Android.bp
index 3382e6c..a738f67 100644
--- a/tetheroffload/config/V1_0/build/Android.bp
+++ b/tetheroffload/config/V1_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.tetheroffload.config@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tetheroffload.config@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tetheroffload.config@1.0",
],
diff --git a/tetheroffload/control/V1_0/build/Android.bp b/tetheroffload/control/V1_0/build/Android.bp
index a6850a3..5840b14 100644
--- a/tetheroffload/control/V1_0/build/Android.bp
+++ b/tetheroffload/control/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.tetheroffload.control@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tetheroffload.control@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tetheroffload.control@1.0",
],
diff --git a/thermal/V1_0/build/Android.bp b/thermal/V1_0/build/Android.bp
index 1cdeaf4..b48ac1a 100644
--- a/thermal/V1_0/build/Android.bp
+++ b/thermal/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.thermal@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.thermal@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.thermal@1.0",
],
diff --git a/tv/cec/V1_0/build/Android.bp b/tv/cec/V1_0/build/Android.bp
index dd2f0a7..2cd74f2 100644
--- a/tv/cec/V1_0/build/Android.bp
+++ b/tv/cec/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.tv.cec@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tv.cec@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tv.cec@1.0",
],
diff --git a/tv/input/V1_0/build/Android.bp b/tv/input/V1_0/build/Android.bp
index 7f59e05..932bdd6 100644
--- a/tv/input/V1_0/build/Android.bp
+++ b/tv/input/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.tv.input@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tv.input@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.tv.input@1.0",
"android.hardware.audio.common@2.0",
"android.hardware.audio.common@2.0-vts.driver",
diff --git a/usb/V1_0/build/Android.bp b/usb/V1_0/build/Android.bp
index 8e67671..d01d318 100644
--- a/usb/V1_0/build/Android.bp
+++ b/usb/V1_0/build/Android.bp
@@ -49,19 +49,21 @@
generated_headers: ["android.hardware.usb@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.usb@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.usb@1.0",
],
diff --git a/vibrator/V1_0/build/Android.bp b/vibrator/V1_0/build/Android.bp
index 40d2de6..b029ca3 100644
--- a/vibrator/V1_0/build/Android.bp
+++ b/vibrator/V1_0/build/Android.bp
@@ -46,19 +46,21 @@
generated_headers: ["android.hardware.vibrator@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.vibrator@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.vibrator@1.0",
],
diff --git a/vr/V1_0/build/Android.bp b/vr/V1_0/build/Android.bp
index ac556aa..ee741b9 100644
--- a/vr/V1_0/build/Android.bp
+++ b/vr/V1_0/build/Android.bp
@@ -43,19 +43,21 @@
generated_headers: ["android.hardware.vr@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.vr@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.vr@1.0",
],
diff --git a/wifi/V1_0/build/Android.bp b/wifi/V1_0/build/Android.bp
index 7fac837..053d733 100644
--- a/wifi/V1_0/build/Android.bp
+++ b/wifi/V1_0/build/Android.bp
@@ -82,19 +82,21 @@
generated_headers: ["android.hardware.wifi@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.wifi@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.wifi@1.0",
],
diff --git a/wifi/supplicant/V1_0/build/Android.bp b/wifi/supplicant/V1_0/build/Android.bp
index 5a2c713..115cf55 100644
--- a/wifi/supplicant/V1_0/build/Android.bp
+++ b/wifi/supplicant/V1_0/build/Android.bp
@@ -79,19 +79,21 @@
generated_headers: ["android.hardware.wifi.supplicant@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.wifi.supplicant@1.0-vts.driver_genc++_headers"],
shared_libs: [
+ "libcamera_metadata",
+ "libcutils",
+ "libfmq",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
+ "libprotobuf-cpp-full",
"libutils",
- "libcutils",
"libvts_common",
"libvts_datatype",
"libvts_drivercomm",
"libvts_measurement",
"libvts_multidevice_proto",
- "libcamera_metadata",
- "libprotobuf-cpp-full",
+ "android.hidl.allocator@1.0",
"android.hardware.wifi.supplicant@1.0",
],