diff --git a/cmds/monkey/Android.bp b/cmds/monkey/Android.bp
new file mode 100644
index 000000000..192a66a35
--- /dev/null
+++ b/cmds/monkey/Android.bp
@@ -0,0 +1,32 @@
+// Copyright 2008 The Android Open Source Project
+//
+
+package {
+    default_applicable_licenses: ["development_cmds_monkey_license"],
+}
+
+// See: http://go/android-license-faq
+license {
+    name: "development_cmds_monkey_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
+java_library {
+    name: "monkeylib",
+    installable: true,
+    srcs: ["**/*.java"],
+    stem: "monkey",
+}
+
+//###############################################################
+cc_prebuilt_binary {
+    name: "monkey",
+    srcs: ["monkey"],
+    required: ["monkeylib"],
+}
diff --git a/cmds/monkey/Android.mk b/cmds/monkey/Android.mk
deleted file mode 100644
index 6e42eb9cf..000000000
--- a/cmds/monkey/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2008 The Android Open Source Project
-#
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE := monkeylib
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-LOCAL_MODULE_STEM := monkey
-include $(BUILD_JAVA_LIBRARY)
-
-################################################################
-include $(CLEAR_VARS)
-LOCAL_MODULE := monkey
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_SRC_FILES := monkey
-LOCAL_REQUIRED_MODULES := monkeylib
-include $(BUILD_PREBUILT)