diff --git a/libdisplayconfig/Android.bp b/libdisplayconfig/Android.bp
new file mode 100644
index 0000000..c1cc51c
--- /dev/null
+++ b/libdisplayconfig/Android.bp
@@ -0,0 +1,20 @@
+cc_library_shared {
+    name: "libdisplayconfig",
+    vendor_available: true,
+    cflags: [
+        "-Wno-sign-conversion",
+        "-DLOG_TAG=\"libdisplayconfig\"",
+        "-DDISPLAY_CONFIG_1_4"
+    ],
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libutils",
+        "vendor.display.config@1.0",
+        "vendor.display.config@1.4"
+    ],
+    header_libs: ["libhardware_headers", "display_intf_headers"],
+    srcs: ["DisplayConfig.cpp"],
+    export_header_lib_headers: ["display_intf_headers"],
+}
+
diff --git a/libdisplayconfig/Android.mk b/libdisplayconfig/Android.mk
deleted file mode 100644
index 5061886..0000000
--- a/libdisplayconfig/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-display_config_version := $(shell \
-    if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.4" ];\
-    then echo DISPLAY_CONFIG_1_4; fi)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE                  := libdisplayconfig
-LOCAL_MODULE_TAGS             := optional
-LOCAL_HEADER_LIBRARIES        := display_headers
-LOCAL_SRC_FILES               := DisplayConfig.cpp
-LOCAL_SHARED_LIBRARIES        := libhidlbase libhidltransport libutils \
-                                 vendor.display.config@1.0
-
-ifeq ($(display_config_version), DISPLAY_CONFIG_1_4)
-    LOCAL_SHARED_LIBRARIES        += vendor.display.config@1.4
-    LOCAL_CFLAGS                  += -DDISPLAY_CONFIG_1_4
-endif
-
-LOCAL_EXPORT_C_INCLUDE_DIRS   := $(LOCAL_PATH)
-
-ifeq ($(LLVM_SA), true)
-    LOCAL_CFLAGS += --compile-and-analyze --analyzer-perf --analyzer-Werror
-endif
-
-include $(BUILD_SHARED_LIBRARY)