diff --git a/apps/Development/Android.bp b/apps/Development/Android.bp
new file mode 100644
index 000000000..d54b09517
--- /dev/null
+++ b/apps/Development/Android.bp
@@ -0,0 +1,30 @@
+package {
+    default_applicable_licenses: ["development_apps_Development_license"],
+}
+
+// See: http://go/android-license-faq
+license {
+    name: "development_apps_Development_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
+android_app {
+    name: "Development",
+    libs: [
+        "android.test.runner.stubs",
+        "telephony-common",
+        "org.apache.http.legacy",
+    ],
+    srcs: [
+        "**/*.java",
+        "src/com/android/development/IRemoteService.aidl",
+    ],
+    platform_apis: true,
+    certificate: "platform",
+}
diff --git a/apps/Development/Android.mk b/apps/Development/Android.mk
deleted file mode 100644
index 39498d543..000000000
--- a/apps/Development/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs telephony-common org.apache.http.legacy
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files) \
-                src/com/android/development/IRemoteService.aidl \
-
-LOCAL_PACKAGE_NAME := Development
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/NOTICE
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)