diff options
| author | Keun Soo Yim <yim@google.com> | 2016-12-16 12:51:11 -0800 |
|---|---|---|
| committer | Keun Soo Yim <yim@google.com> | 2016-12-16 13:40:33 -0800 |
| commit | b62dc3e6ee34cb919d385cdc30f1a01860c45f34 (patch) | |
| tree | 2461944aab2c9eda723805bcf9aaa5a0e1aaebc2 /vr/1.0 | |
| parent | 0c07b20aa8178d75cf3e2876423fdc97b5f2be7e (diff) | |
| download | platform_hardware_interfaces-b62dc3e6ee34cb919d385cdc30f1a01860c45f34.tar.gz platform_hardware_interfaces-b62dc3e6ee34cb919d385cdc30f1a01860c45f34.tar.bz2 platform_hardware_interfaces-b62dc3e6ee34cb919d385cdc30f1a01860c45f34.zip | |
use the new oneshot vts driver generation build rule
Test: mma
Change-Id: Ib15399d6e7d5049b7a1912623ac2d95de9dfba73
Diffstat (limited to 'vr/1.0')
| -rw-r--r-- | vr/1.0/Android.bp | 54 | ||||
| -rw-r--r-- | vr/1.0/vts/Android.mk | 29 |
2 files changed, 54 insertions, 29 deletions
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) |