diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..3b5b836
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,22 @@
+
+
+cc_library_static {
+    name: "libhealthd.msm",
+    srcs: [
+        "healthd_board_msm.cpp",
+        "healthd_msm_alarm.cpp",
+    ],
+
+    cflags: ["-Werror"],
+    include_dirs: [
+        "bootable/recovery",
+        "bootable/recovery/minui/include",
+    ],
+
+    header_libs: [
+        "libbatteryservice_headers",
+        "libbase_headers",
+        "libhealthd_headers",
+    ],
+
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index b50e33b..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := healthd_board_msm.cpp healthd_msm_alarm.cpp
-LOCAL_MODULE := libhealthd.msm
-
-LOCAL_CFLAGS := -Werror
-LOCAL_C_INCLUDES := \
-    system/core/healthd/include/healthd/ \
-    system/core/base/include \
-    bootable/recovery \
-    bootable/recovery/minui/include
-
-LOCAL_HEADER_LIBRARIES := libbatteryservice_headers
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/healthd_board_msm.cpp b/healthd_board_msm.cpp
index 5dc5ce8..a108e3b 100644
--- a/healthd_board_msm.cpp
+++ b/healthd_board_msm.cpp
@@ -36,7 +36,7 @@
 #include <batteryservice/BatteryService.h>
 #include <cutils/android_reboot.h>
 #include <cutils/properties.h>
-#include <healthd.h>
+#include <healthd/healthd.h>
 #include "minui/minui.h"
 #include "healthd_msm.h"
 #define ARRAY_SIZE(x)           (sizeof(x)/sizeof(x[0]))