diff options
| author | Zhuoyao Zhang <zhuoyao@google.com> | 2016-12-21 17:04:49 -0800 |
|---|---|---|
| committer | Zhuoyao Zhang <zhuoyao@google.com> | 2016-12-22 17:09:12 -0800 |
| commit | c57e359d1a6bacffcc184b8d0ae75f02cb1e4ef8 (patch) | |
| tree | 4dd7c67996c8e1b95765720fb8e1e7b6303e0440 /vr | |
| parent | a13ec5a81cff3c95b985c0d3ddffebe4f2091225 (diff) | |
| download | android_hardware_interfaces-c57e359d1a6bacffcc184b8d0ae75f02cb1e4ef8.tar.gz android_hardware_interfaces-c57e359d1a6bacffcc184b8d0ae75f02cb1e4ef8.tar.bz2 android_hardware_interfaces-c57e359d1a6bacffcc184b8d0ae75f02cb1e4ef8.zip | |
Update Android.bp and vts/Android.mk for Hidl HALs
* Using update-makefiles.sh to add make rule for profiler in Android.bp
* Remove make rule for profiler in vts/Android.mk.
Bug:31930023
Test: mma
Change-Id: Iea834d8610501c2fce63f65742db31bafb85c0b8
Diffstat (limited to 'vr')
| -rw-r--r-- | vr/1.0/Android.bp | 41 | ||||
| -rw-r--r-- | vr/1.0/vts/Android.mk | 34 |
2 files changed, 42 insertions, 33 deletions
diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp index 240b7ad30..3397bff40 100644 --- a/vr/1.0/Android.bp +++ b/vr/1.0/Android.bp @@ -104,3 +104,44 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.vr@1.0-IVr-vts.profiler_genc++", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mPROFILER -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@1.0-IVr-vts.profiler_genc++_headers", + tools: ["hidl-gen", "vtsc"], + cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0 && $(location vtsc) -mPROFILER -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@1.0-IVr-vts.profiler", + generated_sources: ["android.hardware.vr@1.0-IVr-vts.profiler_genc++"], + generated_headers: ["android.hardware.vr@1.0-IVr-vts.profiler_genc++_headers"], + export_generated_headers: ["android.hardware.vr@1.0-IVr-vts.profiler_genc++_headers"], + shared_libs: [ + "libbase", + "libhidlbase", + "libhidltransport", + "libvts_profiling", + "libvts_multidevice_proto", + "libprotobuf-cpp-full", + "android.hidl.base@1.0", + "android.hardware.vr@1.0", + ], +} diff --git a/vr/1.0/vts/Android.mk b/vr/1.0/vts/Android.mk index ac1cad5f9..df5dac807 100644 --- a/vr/1.0/vts/Android.mk +++ b/vr/1.0/vts/Android.mk @@ -16,36 +16,4 @@ LOCAL_PATH := $(call my-dir) -# build profiler for Vr. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_profiler_hidl_vr@1.0 - -LOCAL_SRC_FILES := \ - Vr.vts \ - -LOCAL_C_INCLUDES += \ - test/vts/drivers/libprofiling \ - -LOCAL_VTS_MODE := PROFILER - -LOCAL_SHARED_LIBRARIES := \ - android.hardware.vr@1.0 \ - libbase \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_multidevice_proto \ - libvts_profiling \ - libutils \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -include $(BUILD_SHARED_LIBRARY) - -# include hidl test makefiles -include $(LOCAL_PATH)/functional/vts/testcases/hal/vr/hidl/Android.mk +include $(call all-subdir-makefiles)
\ No newline at end of file |