diff options
| author | Steven Moreland <smoreland@google.com> | 2017-04-21 00:03:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-21 00:03:11 +0000 |
| commit | 9a33cae051aba5f951116f1ea4d4b78418f36777 (patch) | |
| tree | 2bde37db16afeec2551efb4eff4d87f75a3b593a | |
| parent | b0a4e9bbefb21db05431aeef21600ac6bbc9151f (diff) | |
| parent | f1b07d51ed6a11a0446115934fb75c22a1badb87 (diff) | |
| download | native-9a33cae051aba5f951116f1ea4d4b78418f36777.tar.gz | |
Merge "(lib)?sensorservice: Android.mk -> Android.bp"
| -rw-r--r-- | services/sensorservice/Android.bp | 59 | ||||
| -rw-r--r-- | services/sensorservice/Android.mk | 62 |
2 files changed, 59 insertions, 62 deletions
diff --git a/services/sensorservice/Android.bp b/services/sensorservice/Android.bp new file mode 100644 index 0000000000..758c38f8e3 --- /dev/null +++ b/services/sensorservice/Android.bp @@ -0,0 +1,59 @@ +cc_library_shared { + name: "libsensorservice", + + srcs: [ + "BatteryService.cpp", + "CorrectedGyroSensor.cpp", + "Fusion.cpp", + "GravitySensor.cpp", + "LinearAccelerationSensor.cpp", + "OrientationSensor.cpp", + "RecentEventLogger.cpp", + "RotationVectorSensor.cpp", + "SensorDevice.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", + "libui", + "libgui", + "libcrypto", + ], +} + +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 7b10319e1b..0000000000 --- a/services/sensorservice/Android.mk +++ /dev/null @@ -1,62 +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 \ - 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 \ - libui \ - libgui \ - libcrypto - -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) |