diff options
-rw-r--r-- | boot/1.0/Android.bp | 58 | ||||
-rw-r--r-- | boot/1.0/vts/Android.mk | 30 | ||||
-rw-r--r-- | light/2.0/Android.bp | 58 | ||||
-rw-r--r-- | light/2.0/vts/Android.mk | 30 | ||||
-rw-r--r-- | memtrack/1.0/Android.bp | 58 | ||||
-rw-r--r-- | memtrack/1.0/vts/Android.mk | 30 | ||||
-rw-r--r-- | nfc/1.0/Android.bp | 4 | ||||
-rw-r--r-- | power/1.0/Android.bp | 58 | ||||
-rw-r--r-- | power/1.0/vts/Android.mk | 30 | ||||
-rw-r--r-- | thermal/1.0/Android.bp | 58 | ||||
-rw-r--r-- | tv/cec/1.0/Android.bp | 62 | ||||
-rw-r--r-- | tv/cec/1.0/vts/Android.mk | 34 | ||||
-rw-r--r-- | vehicle/2.0/Android.bp | 62 | ||||
-rw-r--r-- | vehicle/2.0/vts/Android.mk | 32 | ||||
-rw-r--r-- | vibrator/1.0/Android.bp | 58 | ||||
-rw-r--r-- | vibrator/1.0/vts/Android.mk | 30 | ||||
-rw-r--r-- | vr/1.0/Android.bp | 54 | ||||
-rw-r--r-- | vr/1.0/vts/Android.mk | 29 |
18 files changed, 529 insertions, 246 deletions
diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp index d67972f257..4eb728dddb 100644 --- a/boot/1.0/Android.bp +++ b/boot/1.0/Android.bp @@ -54,3 +54,61 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.boot.vts.driver@1.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/", + srcs: [ + "types.hal", + "IBootControl.hal", + ], + out: [ + "android/hardware/boot/1.0/types.vts.cpp", + "android/hardware/boot/1.0/BootControl.vts.cpp", + ], +} + +genrule { + name: "android.hardware.boot.vts.driver@1.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/", + srcs: [ + "types.hal", + "IBootControl.hal", + ], + out: [ + "android/hardware/boot/1.0/types.vts.h", + "android/hardware/boot/1.0/BootControl.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.boot.vts.driver@1.0", + generated_sources: ["android.hardware.boot.vts.driver@1.0_genc++"], + generated_headers: ["android.hardware.boot.vts.driver@1.0_genc++_headers"], + export_generated_headers: ["android.hardware.boot.vts.driver@1.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.boot@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/boot/1.0/vts/Android.mk b/boot/1.0/vts/Android.mk index 9b30ef1340..d3a385163f 100644 --- a/boot/1.0/vts/Android.mk +++ b/boot/1.0/vts/Android.mk @@ -16,36 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for Boot Control v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_boot@1.0 - -LOCAL_SRC_FILES := \ - BootControl.vts \ - types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.boot@1.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - # build profiler for boot. include $(CLEAR_VARS) diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp index 60e8f8ef4a..a98801c1dc 100644 --- a/light/2.0/Android.bp +++ b/light/2.0/Android.bp @@ -54,3 +54,61 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.light.vts.driver@2.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/", + srcs: [ + "types.hal", + "ILight.hal", + ], + out: [ + "android/hardware/light/2.0/types.vts.cpp", + "android/hardware/light/2.0/Light.vts.cpp", + ], +} + +genrule { + name: "android.hardware.light.vts.driver@2.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/", + srcs: [ + "types.hal", + "ILight.hal", + ], + out: [ + "android/hardware/light/2.0/types.vts.h", + "android/hardware/light/2.0/Light.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.light.vts.driver@2.0", + generated_sources: ["android.hardware.light.vts.driver@2.0_genc++"], + generated_headers: ["android.hardware.light.vts.driver@2.0_genc++_headers"], + export_generated_headers: ["android.hardware.light.vts.driver@2.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.light@2.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/light/2.0/vts/Android.mk b/light/2.0/vts/Android.mk index 0df4772333..089503bdaf 100644 --- a/light/2.0/vts/Android.mk +++ b/light/2.0/vts/Android.mk @@ -16,34 +16,4 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for Light v2.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_light@2.0 - -LOCAL_SRC_FILES := \ - Light.vts \ - types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.light@2.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp index b56ffeb7d0..c80ebf89a4 100644 --- a/memtrack/1.0/Android.bp +++ b/memtrack/1.0/Android.bp @@ -54,3 +54,61 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.memtrack.vts.driver@1.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/", + srcs: [ + "types.hal", + "IMemtrack.hal", + ], + out: [ + "android/hardware/memtrack/1.0/types.vts.cpp", + "android/hardware/memtrack/1.0/Memtrack.vts.cpp", + ], +} + +genrule { + name: "android.hardware.memtrack.vts.driver@1.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/", + srcs: [ + "types.hal", + "IMemtrack.hal", + ], + out: [ + "android/hardware/memtrack/1.0/types.vts.h", + "android/hardware/memtrack/1.0/Memtrack.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.memtrack.vts.driver@1.0", + generated_sources: ["android.hardware.memtrack.vts.driver@1.0_genc++"], + generated_headers: ["android.hardware.memtrack.vts.driver@1.0_genc++_headers"], + export_generated_headers: ["android.hardware.memtrack.vts.driver@1.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.memtrack@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/memtrack/1.0/vts/Android.mk b/memtrack/1.0/vts/Android.mk index 8a5ceb10c6..4a5ca4f66f 100644 --- a/memtrack/1.0/vts/Android.mk +++ b/memtrack/1.0/vts/Android.mk @@ -16,36 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for memtrack v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_memtrack@1.0 - -LOCAL_SRC_FILES := \ - Memtrack.vts \ - types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.memtrack@1.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - # build profiler for memtrack. include $(CLEAR_VARS) diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp index 0c70f10fb1..930fb143dc 100644 --- a/nfc/1.0/Android.bp +++ b/nfc/1.0/Android.bp @@ -66,7 +66,7 @@ cc_library_shared { genrule { name: "android.hardware.nfc.vts.driver@1.0_genc++", tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -L vts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/", + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/", srcs: [ "types.hal", "INfc.hal", @@ -82,7 +82,7 @@ genrule { genrule { name: "android.hardware.nfc.vts.driver@1.0_genc++_headers", tools: ["hidl-gen", "vtsc"], - cmd: "$(location hidl-gen) -o $(genDir) -L vts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/", + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/", srcs: [ "types.hal", "INfc.hal", diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp index 3503f0e385..2eb9e3470f 100644 --- a/power/1.0/Android.bp +++ b/power/1.0/Android.bp @@ -54,3 +54,61 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.power.vts.driver@1.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/", + srcs: [ + "types.hal", + "IPower.hal", + ], + out: [ + "android/hardware/power/1.0/types.vts.cpp", + "android/hardware/power/1.0/Power.vts.cpp", + ], +} + +genrule { + name: "android.hardware.power.vts.driver@1.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/", + srcs: [ + "types.hal", + "IPower.hal", + ], + out: [ + "android/hardware/power/1.0/types.vts.h", + "android/hardware/power/1.0/Power.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.power.vts.driver@1.0", + generated_sources: ["android.hardware.power.vts.driver@1.0_genc++"], + generated_headers: ["android.hardware.power.vts.driver@1.0_genc++_headers"], + export_generated_headers: ["android.hardware.power.vts.driver@1.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.power@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/power/1.0/vts/Android.mk b/power/1.0/vts/Android.mk index 4164baf5a7..db7e98ec61 100644 --- a/power/1.0/vts/Android.mk +++ b/power/1.0/vts/Android.mk @@ -16,36 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for Power v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_power@1.0 - -LOCAL_SRC_FILES := \ - Power.vts \ - types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.power@1.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - # build profiler for power. include $(CLEAR_VARS) diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp index b887f16ecf..c73ab42843 100644 --- a/thermal/1.0/Android.bp +++ b/thermal/1.0/Android.bp @@ -54,3 +54,61 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.thermal.vts.driver@1.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/", + srcs: [ + "types.hal", + "IThermal.hal", + ], + out: [ + "android/hardware/thermal/1.0/types.vts.cpp", + "android/hardware/thermal/1.0/Thermal.vts.cpp", + ], +} + +genrule { + name: "android.hardware.thermal.vts.driver@1.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.thermal@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/", + srcs: [ + "types.hal", + "IThermal.hal", + ], + out: [ + "android/hardware/thermal/1.0/types.vts.h", + "android/hardware/thermal/1.0/Thermal.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.thermal.vts.driver@1.0", + generated_sources: ["android.hardware.thermal.vts.driver@1.0_genc++"], + generated_headers: ["android.hardware.thermal.vts.driver@1.0_genc++_headers"], + export_generated_headers: ["android.hardware.thermal.vts.driver@1.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.thermal@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp index 53b1ce860a..b6dc3b1bcf 100644 --- a/tv/cec/1.0/Android.bp +++ b/tv/cec/1.0/Android.bp @@ -62,3 +62,65 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.tv.cec.vts.driver@1.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/", + srcs: [ + "types.hal", + "IHdmiCec.hal", + "IHdmiCecCallback.hal", + ], + out: [ + "android/hardware/tv/cec/1.0/types.vts.cpp", + "android/hardware/tv/cec/1.0/HdmiCec.vts.cpp", + "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.cpp", + ], +} + +genrule { + name: "android.hardware.tv.cec.vts.driver@1.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tv.cec@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/", + srcs: [ + "types.hal", + "IHdmiCec.hal", + "IHdmiCecCallback.hal", + ], + out: [ + "android/hardware/tv/cec/1.0/types.vts.h", + "android/hardware/tv/cec/1.0/HdmiCec.vts.h", + "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.tv.cec.vts.driver@1.0", + generated_sources: ["android.hardware.tv.cec.vts.driver@1.0_genc++"], + generated_headers: ["android.hardware.tv.cec.vts.driver@1.0_genc++_headers"], + export_generated_headers: ["android.hardware.tv.cec.vts.driver@1.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.tv.cec@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/tv/cec/1.0/vts/Android.mk b/tv/cec/1.0/vts/Android.mk index d25fb31109..a7eeb33a91 100644 --- a/tv/cec/1.0/vts/Android.mk +++ b/tv/cec/1.0/vts/Android.mk @@ -16,38 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for TvCec v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_tv_cec@1.0 - -LOCAL_SRC_FILES := \ - HdmiCec.vts \ - HdmiCecCallback.vts \ - types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.tv.cec@1.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - - # build VTS profiler for HdmiCec include $(CLEAR_VARS) @@ -117,4 +85,4 @@ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) -include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/vehicle/2.0/Android.bp b/vehicle/2.0/Android.bp index 6c96d3f2b1..571ef2b675 100644 --- a/vehicle/2.0/Android.bp +++ b/vehicle/2.0/Android.bp @@ -62,3 +62,65 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.vehicle.vts.driver@2.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/", + srcs: [ + "types.hal", + "IVehicle.hal", + "IVehicleCallback.hal", + ], + out: [ + "android/hardware/vehicle/2.0/types.vts.cpp", + "android/hardware/vehicle/2.0/Vehicle.vts.cpp", + "android/hardware/vehicle/2.0/VehicleCallback.vts.cpp", + ], +} + +genrule { + name: "android.hardware.vehicle.vts.driver@2.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vehicle@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vehicle/2.0/ $(genDir)/android/hardware/vehicle/2.0/", + srcs: [ + "types.hal", + "IVehicle.hal", + "IVehicleCallback.hal", + ], + out: [ + "android/hardware/vehicle/2.0/types.vts.h", + "android/hardware/vehicle/2.0/Vehicle.vts.h", + "android/hardware/vehicle/2.0/VehicleCallback.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.vehicle.vts.driver@2.0", + generated_sources: ["android.hardware.vehicle.vts.driver@2.0_genc++"], + generated_headers: ["android.hardware.vehicle.vts.driver@2.0_genc++_headers"], + export_generated_headers: ["android.hardware.vehicle.vts.driver@2.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.vehicle@2.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/vehicle/2.0/vts/Android.mk b/vehicle/2.0/vts/Android.mk index 8370067e99..b7f185d036 100644 --- a/vehicle/2.0/vts/Android.mk +++ b/vehicle/2.0/vts/Android.mk @@ -16,38 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for Vehicle v2.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_vehicle@2.0 - -LOCAL_SRC_FILES := \ - Vehicle.vts \ - VehicleCallback.vts \ - types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.vehicle@2.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - - # build profiler for Vehicle. include $(CLEAR_VARS) diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp index 75a3bfa3f1..ec97cfbee6 100644 --- a/vibrator/1.0/Android.bp +++ b/vibrator/1.0/Android.bp @@ -54,3 +54,61 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.vibrator.vts.driver@1.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/", + srcs: [ + "types.hal", + "IVibrator.hal", + ], + out: [ + "android/hardware/vibrator/1.0/types.vts.cpp", + "android/hardware/vibrator/1.0/Vibrator.vts.cpp", + ], +} + +genrule { + name: "android.hardware.vibrator.vts.driver@1.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/", + srcs: [ + "types.hal", + "IVibrator.hal", + ], + out: [ + "android/hardware/vibrator/1.0/types.vts.h", + "android/hardware/vibrator/1.0/Vibrator.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.vibrator.vts.driver@1.0", + generated_sources: ["android.hardware.vibrator.vts.driver@1.0_genc++"], + generated_headers: ["android.hardware.vibrator.vts.driver@1.0_genc++_headers"], + export_generated_headers: ["android.hardware.vibrator.vts.driver@1.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.vibrator@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/vibrator/1.0/vts/Android.mk b/vibrator/1.0/vts/Android.mk index 080eb882f3..084dcf7beb 100644 --- a/vibrator/1.0/vts/Android.mk +++ b/vibrator/1.0/vts/Android.mk @@ -16,36 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for Vibrator v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_vibrator@1.0 - -LOCAL_SRC_FILES := \ - Vibrator.vts \ - types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.vibrator@1.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - # build profiler for vibrator. include $(CLEAR_VARS) diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp index 57c9257b5e..240b7ad30e 100644 --- a/vr/1.0/Android.bp +++ b/vr/1.0/Android.bp @@ -50,3 +50,57 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.vr.vts.driver@1.0_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/", + srcs: [ + "IVr.hal", + ], + out: [ + "android/hardware/vr/1.0/Vr.vts.cpp", + ], +} + +genrule { + name: "android.hardware.vr.vts.driver@1.0_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/", + srcs: [ + "IVr.hal", + ], + out: [ + "android/hardware/vr/1.0/Vr.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.vr.vts.driver@1.0", + generated_sources: ["android.hardware.vr.vts.driver@1.0_genc++"], + generated_headers: ["android.hardware.vr.vts.driver@1.0_genc++_headers"], + export_generated_headers: ["android.hardware.vr.vts.driver@1.0_genc++_headers"], + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libvts_common", + "libvts_datatype", + "libvts_measurement", + "libvts_multidevice_proto", + "libcamera_metadata", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.vr@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/vr/1.0/vts/Android.mk b/vr/1.0/vts/Android.mk index 8a1312d612..ac1cad5f9e 100644 --- a/vr/1.0/vts/Android.mk +++ b/vr/1.0/vts/Android.mk @@ -16,35 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for Vr v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_vr@1.0 - -LOCAL_SRC_FILES := \ - Vr.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.vr@1.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - # build profiler for Vr. include $(CLEAR_VARS) |