From ceb15077bb70e2ca8bf405a94124df78d1f70d68 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Wed, 1 Aug 2018 10:10:46 -0700
Subject: [PATCH] Soongify PackageInstaller.

Test: Built, installed app
Change-Id: I29e21e177ae3a89d6814efa6c164fd6b2c80cf3d
---
 packages/PackageInstaller/Android.bp | 14 ++++++++++++++
 packages/PackageInstaller/Android.mk | 23 -----------------------
 2 files changed, 14 insertions(+), 23 deletions(-)
 create mode 100644 packages/PackageInstaller/Android.bp
 delete mode 100644 packages/PackageInstaller/Android.mk

diff --git a/packages/PackageInstaller/Android.bp b/packages/PackageInstaller/Android.bp
new file mode 100644
index 0000000000000..bc06cab7aef5c
--- /dev/null
+++ b/packages/PackageInstaller/Android.bp
@@ -0,0 +1,14 @@
+android_app {
+    name: "PackageInstaller",
+
+    srcs: ["src/**/*.java"],
+
+    static_libs: [
+        "androidx.leanback_leanback",
+        "xz-java",
+    ],
+
+    certificate: "platform",
+    privileged: true,
+    platform_apis: true,
+}
\ No newline at end of file
diff --git a/packages/PackageInstaller/Android.mk b/packages/PackageInstaller/Android.mk
deleted file mode 100644
index f371fb9b9f63a..0000000000000
--- a/packages/PackageInstaller/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, src)
-
-LOCAL_STATIC_ANDROID_LIBRARIES += \
-    androidx.leanback_leanback
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    xz-java
-
-LOCAL_PACKAGE_NAME := PackageInstaller
-
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-include $(BUILD_PACKAGE)