From 62254b17ea6642e83e5649d530ffe0e1b9917951 Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Mon, 18 May 2020 14:51:06 -0700
Subject: [PATCH] Convert core/tests/packagemanagertests/Android.mk file to
 Android.bp

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

Bug: 122332340
Test: treehugger
Change-Id: I0daafeac01b5ebe027058d047db036187cef563d
---
 core/tests/packagemanagertests/Android.bp | 14 ++++++++++++++
 core/tests/packagemanagertests/Android.mk | 22 ----------------------
 2 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 core/tests/packagemanagertests/Android.bp
 delete mode 100644 core/tests/packagemanagertests/Android.mk

diff --git a/core/tests/packagemanagertests/Android.bp b/core/tests/packagemanagertests/Android.bp
new file mode 100644
index 0000000000000..6f39af8bd468d
--- /dev/null
+++ b/core/tests/packagemanagertests/Android.bp
@@ -0,0 +1,14 @@
+android_test {
+    name: "FrameworksCorePackageManagerTests",
+    // We only want this apk build for tests.
+    // Include all test java files.
+    srcs: ["src/**/*.java"],
+    static_libs: [
+        "androidx.test.rules",
+        "frameworks-base-testutils",
+        "mockito-target-minus-junit4",
+    ],
+    libs: ["android.test.runner"],
+    platform_apis: true,
+    certificate: "platform",
+}
diff --git a/core/tests/packagemanagertests/Android.mk b/core/tests/packagemanagertests/Android.mk
deleted file mode 100644
index 8c00d14ce856f..0000000000000
--- a/core/tests/packagemanagertests/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    androidx.test.rules \
-    frameworks-base-testutils \
-    mockito-target-minus-junit4
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PACKAGE_NAME := FrameworksCorePackageManagerTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)