From bdf46bdb5d77a02d17fa4b84204945e03222b36f Mon Sep 17 00:00:00 2001
From: Yuntao Xu <yuntaoxu@google.com>
Date: Fri, 30 Apr 2021 18:41:41 +0000
Subject: [PATCH] Revert "Convert Development/Android.mk to Android.bp"

This reverts commit 5ec6ecafd8bc5320af060ca1028cd935332e2eec.

Reason for revert: <cause build breakage>

Change-Id: Ib761f8675b3f09a53f33b786101022de287ac4ea
---
 apps/Development/Android.bp | 30 ------------------------------
 apps/Development/Android.mk | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 apps/Development/Android.bp
 create mode 100644 apps/Development/Android.mk

diff --git a/apps/Development/Android.bp b/apps/Development/Android.bp
deleted file mode 100644
index d54b09517..000000000
--- a/apps/Development/Android.bp
+++ /dev/null
@@ -1,30 +0,0 @@
-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
new file mode 100644
index 000000000..39498d543
--- /dev/null
+++ b/apps/Development/Android.mk
@@ -0,0 +1,18 @@
+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)