diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 3cc93fb..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Include the makefiles under this directory.
-include $(call all-makefiles-under,$(call my-dir))
diff --git a/XMPCore/Android.bp b/XMPCore/Android.bp
new file mode 100644
index 0000000..449826f
--- /dev/null
+++ b/XMPCore/Android.bp
@@ -0,0 +1,6 @@
+java_library {
+    name: "xmp_toolkit",
+    // Include all the java files.
+    srcs: ["src/**/*.java"],
+    sdk_version: "8",
+}
diff --git a/XMPCore/Android.mk b/XMPCore/Android.mk
deleted file mode 100644
index 955d296..0000000
--- a/XMPCore/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include all the java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_SDK_VERSION := 8
-
-# The name of the jar file to create.
-LOCAL_MODULE := xmp_toolkit
-
-# Build a static jar file.
-include $(BUILD_STATIC_JAVA_LIBRARY)