commit 5e0ecc121c7893de01891e3e99dceb076926770e
author Steven Moreland <smoreland@google.com> Fri Apr 21 01:03:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 21 01:03:31 2017 +0000
tree 958905a19f23c42e3909241caea05950b08d8b76
parent be2b9e24213947a78d2b4034cc5cb319a67005c2
parent 40d89431dbad9c7f5820ddbe21dd8a532f58f0f5

resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp
am: 40d89431db

Change-Id: Iaa9b4f107451c4936025231b6eeb0d23454c1d36

services/sensorservice/Android.bp

diff --git a/services/sensorservice/Android.bp b/services/sensorservice/Android.bp
index 8c2300e..9e704d3 100644
--- a/services/sensorservice/Android.bp
+++ b/services/sensorservice/Android.bp
@@ -1,3 +1,63 @@
 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",
+        "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",
+    ],
+}