diff options
author | Steven Moreland <smoreland@google.com> | 2017-04-21 13:08:34 -0700 |
---|---|---|
committer | Peng Xu <pengxu@google.com> | 2017-09-21 17:54:18 +0000 |
commit | ce3267f94c04048d71002406a3ecd4ce8b702ab2 (patch) | |
tree | 7ba4955474eb540656568aefc25faa230832f6e7 /services/sensorservice | |
parent | 4cd60011da95e2392dda1eef78aaa6037fb57e19 (diff) | |
download | native-ce3267f94c04048d71002406a3ecd4ce8b702ab2.tar.gz |
sensorservice: Android.mk -> Android.bp
Test: links
Change-Id: Ibe409076b4cdbf45d8477b466dbb9442362863c7
Merged-In: Ibe409076b4cdbf45d8477b466dbb9442362863c7
Diffstat (limited to 'services/sensorservice')
-rw-r--r-- | services/sensorservice/Android.bp | 70 | ||||
-rw-r--r-- | services/sensorservice/Android.mk | 73 |
2 files changed, 70 insertions, 73 deletions
diff --git a/services/sensorservice/Android.bp b/services/sensorservice/Android.bp index 8c2300e9d0..8d381b1c31 100644 --- a/services/sensorservice/Android.bp +++ b/services/sensorservice/Android.bp @@ -1,3 +1,73 @@ subdirs = [ "hidl" ] +cc_library_shared { + name: "libsensorservice", + + srcs: [ + "BatteryService.cpp", + "CorrectedGyroSensor.cpp", + "Fusion.cpp", + "GravitySensor.cpp", + "LinearAccelerationSensor.cpp", + "OrientationSensor.cpp", + "RecentEventLogger.cpp", + "RotationVectorSensor.cpp", + "SensorDevice.cpp", + "SensorDirectConnection.cpp", + "SensorEventConnection.cpp", + "SensorFusion.cpp", + "SensorInterface.cpp", + "SensorList.cpp", + "SensorRecord.cpp", + "SensorService.cpp", + "SensorServiceUtils.cpp", + ], + + cflags: [ + "-DLOG_TAG=\"SensorService\"", + "-Wall", + "-Werror", + "-Wextra", + "-fvisibility=hidden" + ], + + shared_libs: [ + "libcutils", + "libhardware", + "libhardware_legacy", + "libutils", + "liblog", + "libbinder", + "libsensor", + "libcrypto", + "libbase", + "libhidlbase", + "libhidltransport", + "libhwbinder", + "android.hardware.sensors@1.0", + ], + + static_libs: ["android.hardware.sensors@1.0-convert"], + + // our public headers depend on libsensor + export_shared_lib_headers: ["libsensor"], +} + +cc_binary { + name: "sensorservice", + + srcs: ["main_sensorservice.cpp"], + + shared_libs: [ + "libsensorservice", + "libbinder", + "libutils", + ], + + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + ], +} diff --git a/services/sensorservice/Android.mk b/services/sensorservice/Android.mk deleted file mode 100644 index cfb72310d5..0000000000 --- a/services/sensorservice/Android.mk +++ /dev/null @@ -1,73 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - BatteryService.cpp \ - CorrectedGyroSensor.cpp \ - Fusion.cpp \ - GravitySensor.cpp \ - LinearAccelerationSensor.cpp \ - OrientationSensor.cpp \ - RecentEventLogger.cpp \ - RotationVectorSensor.cpp \ - SensorDevice.cpp \ - SensorDirectConnection.cpp \ - SensorEventConnection.cpp \ - SensorFusion.cpp \ - SensorInterface.cpp \ - SensorList.cpp \ - SensorRecord.cpp \ - SensorService.cpp \ - SensorServiceUtils.cpp \ - -LOCAL_CFLAGS:= -DLOG_TAG=\"SensorService\" - -LOCAL_CFLAGS += -Wall -Werror -Wextra - -LOCAL_CFLAGS += -fvisibility=hidden - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libhardware \ - libhardware_legacy \ - libutils \ - liblog \ - libbinder \ - libsensor \ - libcrypto \ - libbase \ - libhidlbase \ - libhidltransport \ - libhwbinder \ - android.hardware.sensors@1.0 - -LOCAL_STATIC_LIBRARIES := \ - android.hardware.sensors@1.0-convert - -# our public headers depend on libsensor -LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \ - libsensor \ - -LOCAL_MODULE:= libsensorservice - -include $(BUILD_SHARED_LIBRARY) - -##################################################################### -# build executable -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main_sensorservice.cpp - -LOCAL_SHARED_LIBRARIES := \ - libsensorservice \ - libbinder \ - libutils - -LOCAL_CFLAGS := -Wall -Werror -Wextra - -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE:= sensorservice - -include $(BUILD_EXECUTABLE) |