diff --git a/unix/Android.mk b/unix/Android.mk
deleted file mode 100644
index ea7451c..0000000
--- a/unix/Android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/unix/vncpasswd/Android.bp b/unix/vncpasswd/Android.bp
new file mode 100644
index 0000000..fbf7518
--- /dev/null
+++ b/unix/vncpasswd/Android.bp
@@ -0,0 +1,38 @@
+cc_binary {
+    name: "vncpasswd",
+
+    srcs: ["vncpasswd.cxx"],
+
+    cflags: [
+        "-Ofast",
+        "-Wall",
+        "-Wformat=2",
+        "-DNDEBUG",
+        "-UNDEBUG",
+    ] + ["-Wno-unused-parameter"],
+
+    cppflags: [
+        "-std=c++11",
+        "-fexceptions",
+        "-frtti",
+    ],
+
+    shared_libs: [
+        "libbinder",
+        "libcrypto",
+        "libcutils",
+        "libgui",
+        "libjpeg",
+        "libssl",
+        "libui",
+        "libutils",
+        "libz",
+    ],
+
+    static_libs: ["libtigervnc"],
+
+    include_dirs: ["external/tigervnc/common"],
+
+    system_ext_specific: true,
+
+}
diff --git a/unix/vncpasswd/Android.mk b/unix/vncpasswd/Android.mk
deleted file mode 100644
index 6052ab2..0000000
--- a/unix/vncpasswd/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_CPP_EXTENSION := cxx
-
-LOCAL_SRC_FILES :=  \
-    vncpasswd.cxx
-
-LOCAL_CFLAGS := -Ofast -Wall -Wformat=2 -DNDEBUG -UNDEBUG
-LOCAL_CFLAGS += -Wno-unused-parameter
-
-LOCAL_CPPFLAGS := -std=c++11 -fexceptions -frtti
-
-LOCAL_SHARED_LIBRARIES := \
-    libbinder \
-    libcrypto \
-    libcutils \
-    libgui \
-    libjpeg \
-    libssl \
-    libui \
-    libutils \
-    libz
-
-LOCAL_STATIC_LIBRARIES += \
-    libtigervnc
-
-LOCAL_C_INCLUDES += \
-    external/tigervnc/common
-
-LOCAL_MODULE := vncpasswd
-LOCAL_MODULE_TAGS := optional
-LOCAL_SYSTEM_EXT_MODULE := true
-
-include $(BUILD_EXECUTABLE)