diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7f572f0
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,25 @@
+// Copyright 2008 The Android Open Source Project
+//
+
+subdirs = [
+    "test",
+]
+
+cc_library_static {
+    name: "libconstrainedcrypto",
+    host_supported: true,
+    srcs: [
+        "dsa_sig.c",
+        "p256.c",
+        "p256_ec.c",
+        "p256_ecdsa.c",
+        "rsa.c",
+        "sha.c",
+        "sha256.c",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    export_include_dirs: ["include"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 76e53c5..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2008 The Android Open Source Project
-#
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libconstrainedcrypto
-LOCAL_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c
-LOCAL_CFLAGS := -Wall -Werror
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libconstrainedcrypto
-LOCAL_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c
-LOCAL_CFLAGS := -Wall -Werror
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(LOCAL_PATH)/test/Android.mk
diff --git a/test/Android.bp b/test/Android.bp
new file mode 100644
index 0000000..0cd398e
--- /dev/null
+++ b/test/Android.bp
@@ -0,0 +1,13 @@
+// Copyright 2013 The Android Open Source Project
+
+cc_test_host {
+    name: "constrainedcrypto_rsa_test",
+    srcs: ["rsa_test.c"],
+    static_libs: ["libconstrainedcrypto"],
+}
+
+cc_test_host {
+    name: "constrainedcrypto_ecdsa_test",
+    srcs: ["ecdsa_test.c"],
+    static_libs: ["libconstrainedcrypto"],
+}
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index 97b107a..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013 The Android Open Source Project
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := constrainedcrypto_rsa_test
-LOCAL_SRC_FILES := rsa_test.c
-LOCAL_STATIC_LIBRARIES := libconstrainedcrypto
-include $(BUILD_HOST_NATIVE_TEST)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := constrainedcrypto_ecdsa_test
-LOCAL_SRC_FILES := ecdsa_test.c
-LOCAL_STATIC_LIBRARIES := libconstrainedcrypto
-include $(BUILD_HOST_NATIVE_TEST)