diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..618466f
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,3 @@
+subdirs = [
+    "libfdt"
+]
diff --git a/Android.mk b/Android.mk
index 9fa1c3b..fc4d305 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,5 +29,3 @@
 include $(BUILD_HOST_EXECUTABLE)
 
 $(call dist-for-goals, dist_files, $(ALL_MODULES.dtc.BUILT):dtc/dtc)
-
-include $(LOCAL_PATH)/libfdt/Android.mk
diff --git a/libfdt/Android.bp b/libfdt/Android.bp
new file mode 100644
index 0000000..f496f8f
--- /dev/null
+++ b/libfdt/Android.bp
@@ -0,0 +1,21 @@
+cc_library_static {
+    name: "libfdt",
+    host_supported: true,
+
+    cflags: [
+        "-Wno-macro-redefined",
+        "-Wno-sign-compare",
+    ],
+    srcs: [
+        "fdt.c",
+        "fdt_ro.c",
+        "fdt_wip.c",
+        "fdt_sw.c",
+        "fdt_rw.c",
+        "fdt_strerror.c",
+        "fdt_empty_tree.c",
+        "fdt_addresses.c",
+        "fdt_overlay.c",
+    ],
+    export_include_dirs: ["."],
+}
diff --git a/libfdt/Android.mk b/libfdt/Android.mk
deleted file mode 100644
index a4fff1e..0000000
--- a/libfdt/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-common_src_files := \
-  fdt.c \
-  fdt_ro.c \
-  fdt_wip.c \
-  fdt_sw.c \
-  fdt_rw.c \
-  fdt_strerror.c \
-  fdt_empty_tree.c \
-  fdt_addresses.c \
-  fdt_overlay.c
-
-#################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -Wno-macro-redefined -Wno-sign-compare
-LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_MODULE := libfdt
-
-include $(BUILD_STATIC_LIBRARY)
-
-#################################################
-
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -Wno-macro-redefined -Wno-sign-compare
-LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_MODULE := libfdt
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-