From 82ffa3fe20f8471d83874de2c9367b98cab6891e Mon Sep 17 00:00:00 2001
From: Trevor Radcliffe <tradical@google.com>
Date: Tue, 5 Oct 2021 18:02:21 +0000
Subject: [PATCH] Migrate Dev Tools Build to Soong

Convert development/apps/Development/Android.mk to Android.bp

Fixes: 202173561
Test: apkanalyzer bit for bit identical apks
Test: Treehugger
Change-Id: Iafa8ae1738f60c27c48ef05c6cab858941273165
---
 apps/Development/Android.bp | 56 +++++++++++++++++++++++++++++++++++++
 apps/Development/Android.mk | 21 --------------
 2 files changed, 56 insertions(+), 21 deletions(-)
 create mode 100644 apps/Development/Android.bp
 delete mode 100644 apps/Development/Android.mk

diff --git a/apps/Development/Android.bp b/apps/Development/Android.bp
new file mode 100644
index 000000000..ab36f2c01
--- /dev/null
+++ b/apps/Development/Android.bp
@@ -0,0 +1,56 @@
+//
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package {
+    default_applicable_licenses:   ["development_app_development_license"],
+}
+
+license {
+    name: "development_app_development_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
+android_app {
+    name: "Development",
+
+    libs: [
+        "android.test.runner.stubs",
+        "org.apache.http.legacy",
+        "telephony-common",
+    ],
+
+    uses_libs: [
+        "android.test.runner",
+    ],
+
+    optional_uses_libs: [
+        "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 3db6cc326..000000000
--- a/apps/Development/Android.mk
+++ /dev/null
@@ -1,21 +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_USES_LIBRARIES := android.test.runner
-LOCAL_OPTIONAL_USES_LIBRARIES := org.apache.http.legacy android.test.base android.test.mock
-
-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)