diff --git a/services/sensorservice/Android.bp b/services/sensorservice/Android.bp
deleted file mode 100644
index 758c38f..0000000
--- a/services/sensorservice/Android.bp
+++ /dev/null
@@ -1,59 +0,0 @@
-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
new file mode 100644
index 0000000..7b10319
--- /dev/null
+++ b/services/sensorservice/Android.mk
@@ -0,0 +1,62 @@
+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)