From 516e8193b332c3f1b7b369b92cf5e02b72316892 Mon Sep 17 00:00:00 2001 From: Keun Soo Yim Date: Wed, 21 Dec 2016 13:25:46 -0800 Subject: [PATCH] regen makefiles and delete old vts driver build rules Test: mma Change-Id: I71c4fd68ea6d7a2fac2457b87c82c10490dfb05e --- sensors/1.0/Android.bp | 58 +++++++++++++++++++++++++++++++++++++ sensors/1.0/vts/Android.mk | 30 ------------------- thermal/1.0/vts/Android.mk | 37 ----------------------- tv/input/1.0/vts/Android.mk | 33 --------------------- vehicle/2.0/Android.mk | 4 --- 5 files changed, 58 insertions(+), 104 deletions(-) diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp index ed652658ab..437b545596 100644 --- a/sensors/1.0/Android.bp +++ b/sensors/1.0/Android.bp @@ -54,3 +54,61 @@ cc_library_shared { "android.hidl.base@1.0", ], } + +genrule { + name: "android.hardware.sensors.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.sensors@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/", + srcs: [ + "types.hal", + "ISensors.hal", + ], + out: [ + "android/hardware/sensors/1.0/types.vts.cpp", + "android/hardware/sensors/1.0/Sensors.vts.cpp", + ], +} + +genrule { + name: "android.hardware.sensors.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.sensors@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/", + srcs: [ + "types.hal", + "ISensors.hal", + ], + out: [ + "android/hardware/sensors/1.0/types.vts.h", + "android/hardware/sensors/1.0/Sensors.vts.h", + ], +} + +cc_library_shared { + name: "android.hardware.sensors.vts.driver@1.0", + generated_sources: ["android.hardware.sensors.vts.driver@1.0_genc++"], + generated_headers: ["android.hardware.sensors.vts.driver@1.0_genc++_headers"], + export_generated_headers: ["android.hardware.sensors.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.sensors@1.0", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "android.hidl.base@1.0", + ], +} diff --git a/sensors/1.0/vts/Android.mk b/sensors/1.0/vts/Android.mk index df8d66fbb2..93bbd9645c 100644 --- a/sensors/1.0/vts/Android.mk +++ b/sensors/1.0/vts/Android.mk @@ -16,36 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for Sensors v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_sensors@1.0 - -LOCAL_SRC_FILES := \ - Sensors.vts \ - types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.sensors@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 sensors. include $(CLEAR_VARS) diff --git a/thermal/1.0/vts/Android.mk b/thermal/1.0/vts/Android.mk index ef926fee62..644b2ed44f 100644 --- a/thermal/1.0/vts/Android.mk +++ b/thermal/1.0/vts/Android.mk @@ -16,43 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for Thermal v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_thermal@1.0 - -LOCAL_SRC_FILES := \ - Thermal.vts \ - types.vts \ - -LOCAL_C_INCLUDES := \ - android.hardware.thermal@1.0 \ - system/core/base/include \ - system/core/include \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.thermal@1.0 \ - libbase \ - libutils \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - libprotobuf-cpp-full \ - libvts_common \ - libvts_datatype \ - libvts_measurement \ - libvts_multidevice_proto \ - -LOCAL_STATIC_LIBRARIES := \ - -LOCAL_PROTOC_OPTIMIZE_TYPE := full - -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - # build profiler for thermal. include $(CLEAR_VARS) diff --git a/tv/input/1.0/vts/Android.mk b/tv/input/1.0/vts/Android.mk index f8610dd252..5a60edc525 100644 --- a/tv/input/1.0/vts/Android.mk +++ b/tv/input/1.0/vts/Android.mk @@ -16,39 +16,6 @@ LOCAL_PATH := $(call my-dir) -# build VTS driver for TvInput v1.0. -include $(CLEAR_VARS) - -LOCAL_MODULE := libvts_driver_hidl_tv_input@1.0 - -LOCAL_SRC_FILES := \ - TvInput.vts \ - TvInputCallback.vts \ - types.vts \ - ../../../../audio/common/2.0/vts/types.vts \ - -LOCAL_SHARED_LIBRARIES += \ - android.hardware.tv.input@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 TvInput include $(CLEAR_VARS) diff --git a/vehicle/2.0/Android.mk b/vehicle/2.0/Android.mk index e1b3b391fe..de7d9de2d5 100644 --- a/vehicle/2.0/Android.mk +++ b/vehicle/2.0/Android.mk @@ -681,10 +681,6 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - # # Build types.hal (VehiclePropConfig) #