diff --git a/nci/Android.mk b/nci/Android.mk
deleted file mode 100644
index 34f4385..0000000
--- a/nci/Android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/nci/jni/Android.bp b/nci/jni/Android.bp
new file mode 100644
index 0000000..a143d3a
--- /dev/null
+++ b/nci/jni/Android.bp
@@ -0,0 +1,48 @@
+cc_library_shared {
+    name: "libnfc_nci_jni",
+
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Wno-unused-parameter",
+        "-Werror",
+
+        "-DNXP_UICC_ENABLE",
+    ],
+
+    srcs: ["**/*.cpp"],
+
+    include_dirs: [
+        "system/nfc/src/nfa/include",
+        "system/nfc/src/nfc/include",
+        "system/nfc/src/include",
+        "system/nfc/src/gki/ulinux",
+        "system/nfc/src/gki/common",
+        "system/nfc/utils/include",
+    ],
+
+    local_include_dirs: [
+        "extns/pn54x/inc",
+        "extns/pn54x/src/common",
+        "extns/pn54x/src/mifare",
+    ],
+
+    shared_libs: [
+        "libicuuc",
+        "libnativehelper",
+        "libcutils",
+        "libutils",
+        "liblog",
+        "libnfc-nci",
+        "libchrome",
+        "libbase",
+    ],
+
+    static_libs: ["libxml2"],
+
+    product_variables: {
+        debuggable: {
+            cflags: ["-DDCHECK_ALWAYS_ON"],
+        },
+    },
+}
diff --git a/nci/jni/Android.mk b/nci/jni/Android.mk
deleted file mode 100644
index bfd3d43..0000000
--- a/nci/jni/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-VOB_COMPONENTS := system/nfc/src
-NFA := $(VOB_COMPONENTS)/nfa
-NFC := $(VOB_COMPONENTS)/nfc
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-ifneq ($(NCI_VERSION),)
-LOCAL_CFLAGS += -DNCI_VERSION=$(NCI_VERSION) -O0 -g
-endif
-
-LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter -Werror
-
-ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
-LOCAL_CFLAGS += -DDCHECK_ALWAYS_ON
-endif
-
-LOCAL_SRC_FILES := $(call all-subdir-cpp-files) $(call all-subdir-c-files)
-
-LOCAL_C_INCLUDES += \
-    external/libxml2/include \
-    frameworks/native/include \
-    $(NFA)/include \
-    $(NFA)/brcm \
-    $(NFC)/include \
-    $(NFC)/brcm \
-    $(NFC)/int \
-    $(VOB_COMPONENTS)/hal/include \
-    $(VOB_COMPONENTS)/hal/int \
-    $(VOB_COMPONENTS)/include \
-    $(VOB_COMPONENTS)/gki/ulinux \
-    $(VOB_COMPONENTS)/gki/common \
-    system/nfc/utils/include
-
-LOCAL_SHARED_LIBRARIES := \
-    libicuuc \
-    libnativehelper \
-    libcutils \
-    libutils \
-    liblog \
-    libnfc-nci \
-    libchrome \
-    libbase \
-
-LOCAL_STATIC_LIBRARIES := libxml2
-
-LOCAL_MODULE := libnfc_nci_jni
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/nci/jni/extns/Android.mk b/nci/jni/extns/Android.mk
deleted file mode 100755
index 2363da0..0000000
--- a/nci/jni/extns/Android.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTNS_PATH := $(call my-dir)
-include $(call all-makefiles-under,$(EXTNS_PATH))
diff --git a/nci/jni/extns/pn54x/Android.mk b/nci/jni/extns/pn54x/Android.mk
deleted file mode 100755
index b53712f..0000000
--- a/nci/jni/extns/pn54x/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-EXTN_PN54X_PATH:= $(call my-dir)
-
-LOCAL_SHARED_LIBRARIES := \
-    libchrome \
-    libbase \
-
-LOCAL_C_INCLUDES += \
-    $(EXTN_PN54X_PATH)/inc \
-    $(EXTN_PN54X_PATH)/src/common \
-    $(EXTN_PN54X_PATH)/src/log \
-    $(EXTN_PN54X_PATH)/src/mifare \
-    $(EXTN_PN54X_PATH)/src/utils
-
-LOCAL_CFLAGS += -DNXP_UICC_ENABLE