From 929ab361d62fc29374985bb5597abf177a4c2cda Mon Sep 17 00:00:00 2001
From: Jaewoong Jung <jungjw@google.com>
Date: Thu, 16 May 2019 11:21:00 -0700
Subject: [PATCH] Convert ExtServices/Android.mk to Android.bp.

See build/soong/README.md for more information.

Bug: 122332340
Test: atest ExtServicesUnitTests (no additional failures)
Change-Id: Ib239d928fa37ee8286a232b2798d02262e874cbc
Merged-In: Ib239d928fa37ee8286a232b2798d02262e874cbc
---
 packages/ExtServices/Android.bp       | 26 +++++++++++++++++
 packages/ExtServices/Android.mk       | 42 ---------------------------
 packages/ExtServices/tests/Android.bp | 19 ++++++++++++
 packages/ExtServices/tests/Android.mk | 25 ----------------
 4 files changed, 45 insertions(+), 67 deletions(-)
 create mode 100644 packages/ExtServices/Android.bp
 delete mode 100644 packages/ExtServices/Android.mk
 create mode 100644 packages/ExtServices/tests/Android.bp
 delete mode 100644 packages/ExtServices/tests/Android.mk

diff --git a/packages/ExtServices/Android.bp b/packages/ExtServices/Android.bp
new file mode 100644
index 0000000000000..db94eec17ce80
--- /dev/null
+++ b/packages/ExtServices/Android.bp
@@ -0,0 +1,26 @@
+// Copyright (C) 2016 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.
+
+android_app {
+    name: "ExtServices",
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    certificate: "platform",
+    aaptflags: ["--shared-lib"],
+    export_package_resources: true,
+    optimize: {
+        proguard_flags_files: ["proguard.proguard"],
+    },
+    privileged: true,
+}
diff --git a/packages/ExtServices/Android.mk b/packages/ExtServices/Android.mk
deleted file mode 100644
index 467d7ed202cdc..0000000000000
--- a/packages/ExtServices/Android.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 2016 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := ExtServices
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_CERTIFICATE := platform
-
-LOCAL_AAPT_FLAGS := --shared-lib
-
-LOCAL_EXPORT_PACKAGE_RESOURCES := true
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.proguard
-
-LOCAL_PRIVILEGED_MODULE := true
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
-include $(call all-makefiles-under, $(LOCAL_PATH))
-endif
-
diff --git a/packages/ExtServices/tests/Android.bp b/packages/ExtServices/tests/Android.bp
new file mode 100644
index 0000000000000..db160277b82e1
--- /dev/null
+++ b/packages/ExtServices/tests/Android.bp
@@ -0,0 +1,19 @@
+android_test {
+    name: "ExtServicesUnitTests",
+    certificate: "platform",
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+    ],
+    static_libs: [
+        "androidx.test.rules",
+        "mockito-target-minus-junit4",
+        "androidx.test.espresso.core",
+        "truth-prebuilt",
+        "testables",
+    ],
+    // Include all test java files.
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    instrumentation_for: "ExtServices",
+}
diff --git a/packages/ExtServices/tests/Android.mk b/packages/ExtServices/tests/Android.mk
deleted file mode 100644
index 36e573a3a93b5..0000000000000
--- a/packages/ExtServices/tests/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    androidx.test.rules \
-    mockito-target-minus-junit4 \
-    androidx.test.espresso.core \
-    truth-prebuilt \
-    testables
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := ExtServicesUnitTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_INSTRUMENTATION_FOR := ExtServices
-
-include $(BUILD_PACKAGE)