diff --git a/folio_daemon/Android.bp b/folio_daemon/Android.bp
new file mode 100755
index 0000000..c609cfb
--- /dev/null
+++ b/folio_daemon/Android.bp
@@ -0,0 +1,21 @@
+cc_binary {
+    name: "folio_daemon",
+
+    shared_libs: [
+        "libandroid",
+        "libcutils",
+        "liblog",
+    ],
+
+    srcs: ["main.cpp"],
+
+    cflags: [
+        "-DLOG_TAG=\"folio_daemon\"",
+        "-DLOG_NDEBUG=0",
+        "-Wall",
+        "-Werror",
+    ],
+
+    owner: "google",
+
+}
diff --git a/folio_daemon/Android.mk b/folio_daemon/Android.mk
deleted file mode 100755
index 7318789..0000000
--- a/folio_daemon/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SHARED_LIBRARIES := \
-    libandroid \
-    libcutils \
-    liblog
-
-LOCAL_SRC_FILES := \
-    main.cpp
-
-LOCAL_C_INCLUDES :=
-
-LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"folio_daemon\" -DLOG_NDEBUG=0
-
-LOCAL_CFLAGS += -Wall -Werror
-
-LOCAL_MODULE := folio_daemon
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := google
-LOCAL_PROPRIETARY_MODULE := true
-
-include $(BUILD_EXECUTABLE)