diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..2603472
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,95 @@
+// The clat daemon.
+cc_binary {
+    name: "clatd",
+
+    srcs: [
+        "clatd.c",
+        "dump.c",
+        "checksum.c",
+        "translate.c",
+        "icmp.c",
+        "ipv4.c",
+        "ipv6.c",
+        "config.c",
+        "dns64.c",
+        "logging.c",
+        "getaddr.c",
+        "netlink_callbacks.c",
+        "netlink_msg.c",
+        "setif.c",
+        "mtu.c",
+        "tun.c",
+        "ring.c",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wunused-parameter",
+
+        // Bug: http://b/33566695
+        "-Wno-address-of-packed-member",
+    ],
+
+    include_dirs: ["bionic/libc/dns/include"],
+    header_libs: ["libnetd_client_headers"],
+    static_libs: ["libnl"],
+    shared_libs: [
+        "libcutils",
+        "liblog",
+        "libnetutils",
+    ],
+
+}
+
+// The configuration file.
+prebuilt_etc {
+    name: "clatd.conf",
+    src: "clatd.conf",
+}
+
+// Unit tests.
+cc_test {
+    name: "clatd_test",
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wunused-parameter",
+
+        // Bug: http://b/33566695
+        "-Wno-address-of-packed-member",
+    ],
+
+    srcs: [
+        "clatd_test.cpp",
+        "checksum.c",
+        "translate.c",
+        "icmp.c",
+        "ipv4.c",
+        "ipv6.c",
+        "logging.c",
+        "config.c",
+        "tun.c",
+    ],
+
+    shared_libs: [
+        "liblog",
+        "libnetutils",
+    ],
+}
+
+// Microbenchmark.
+cc_test {
+    name: "clatd_microbenchmark",
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wunused-parameter",
+    ],
+    srcs: [
+        "clatd_microbenchmark.c",
+        "checksum.c",
+        "tun.c",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index cae37fc..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:=clatd.c dump.c checksum.c translate.c icmp.c ipv4.c ipv6.c config.c dns64.c logging.c getaddr.c netlink_callbacks.c netlink_msg.c setif.c mtu.c tun.c ring.c
-
-LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-# Bug: http://b/33566695
-LOCAL_CFLAGS += -Wno-address-of-packed-member
-LOCAL_C_INCLUDES := external/libnl/include bionic/libc/dns/include system/netd/include
-LOCAL_STATIC_LIBRARIES := libnl
-LOCAL_SHARED_LIBRARIES := libcutils liblog libnetutils
-
-# The clat daemon.
-LOCAL_MODULE := clatd
-
-include $(BUILD_EXECUTABLE)
-
-
-# The configuration file.
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := clatd.conf
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-
-
-# Unit tests.
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := clatd_test
-LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-# Bug: http://b/33566695
-LOCAL_CFLAGS += -Wno-address-of-packed-member
-LOCAL_SRC_FILES := clatd_test.cpp checksum.c translate.c icmp.c ipv4.c ipv6.c logging.c config.c tun.c
-LOCAL_MODULE_TAGS := eng tests
-LOCAL_SHARED_LIBRARIES := liblog libnetutils
-
-include $(BUILD_NATIVE_TEST)
-
-# Microbenchmark.
-include $(CLEAR_VARS)
-
-LOCAL_CLANG := true
-LOCAL_MODULE := clatd_microbenchmark
-LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-LOCAL_SRC_FILES := clatd_microbenchmark.c checksum.c tun.c
-LOCAL_MODULE_TAGS := eng tests
-
-include $(BUILD_NATIVE_TEST)