From d26ef690a420bad1b53900bfce5651f77e0c5a9c Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Tue, 13 Nov 2018 15:51:45 -0800
Subject: [PATCH] Prepare PackageInstaller to be signed with google cert

I am not sure if .bp files already allow creating google-signed variations, hence go back to .mk file.

Test: Built + Booted on taimen-eng
Change-Id: I4b413d18eec07a1f84050693a7b8a97b51fa3270
---
 packages/PackageInstaller/Android.bp          | 14 --------
 packages/PackageInstaller/Android.mk          | 32 +++++++++++++++++++
 packages/PackageInstaller/AndroidManifest.xml |  2 ++
 3 files changed, 34 insertions(+), 14 deletions(-)
 delete mode 100644 packages/PackageInstaller/Android.bp
 create mode 100644 packages/PackageInstaller/Android.mk

diff --git a/packages/PackageInstaller/Android.bp b/packages/PackageInstaller/Android.bp
deleted file mode 100644
index bc06cab7aef5c..0000000000000
--- a/packages/PackageInstaller/Android.bp
+++ /dev/null
@@ -1,14 +0,0 @@
-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
new file mode 100644
index 0000000000000..ab5483c8afb82
--- /dev/null
+++ b/packages/PackageInstaller/Android.mk
@@ -0,0 +1,32 @@
+# Copyright (C) 2018 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_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := PackageInstaller
+
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_STATIC_JAVA_LIBRARIES := xz-java
+LOCAL_STATIC_ANDROID_LIBRARIES := androidx.leanback_leanback
+
+include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/packages/PackageInstaller/AndroidManifest.xml b/packages/PackageInstaller/AndroidManifest.xml
index 4801f62bae674..eb9ec82c95199 100644
--- a/packages/PackageInstaller/AndroidManifest.xml
+++ b/packages/PackageInstaller/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.packageinstaller">
 
+    <original-package android:name="com.android.packageinstaller" />
+
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.DELETE_PACKAGES" />