Revert "resolve merge conflicts of 03e80b462 to oc-dev-plus-aosp"

This reverts commit 40d89431dbad9c7f5820ddbe21dd8a532f58f0f5.

Reason for revert: didn't delete mk

Change-Id: Ib3a3f249c278be582de04a583e18de3c0e502d5e

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