From 47bc43a414e6c4ec4effd01802591b59410a16ab Mon Sep 17 00:00:00 2001
From: Keun young Park <keunyoung@google.com>
Date: Fri, 8 Jan 2021 17:21:36 -0800
Subject: [PATCH] add Shell-package-library to allow product type level update

- Car proeducts add additional car permissions to shell package for use cases
  like CTS
- This CL will allow overriding the Shell package rather than adding one
  more package with shared shell uid

Bug: 177099512
Test: Check added package when built in car product.
Change-Id: I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06
Merged-In: I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06
(cherry picked from commit bd16eb5267759cbf0727536d437eee52f7693f33)
---
 packages/Shell/Android.bp | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/Shell/Android.bp b/packages/Shell/Android.bp
index aaaf0448fc317..c51fb56464b08 100644
--- a/packages/Shell/Android.bp
+++ b/packages/Shell/Android.bp
@@ -1,10 +1,14 @@
+// used both for the android_app and android_library
+shell_srcs = ["src/**/*.java",":dumpstate_aidl"]
+shell_static_libs = ["androidx.legacy_legacy-support-v4"]
+
 android_app {
     name: "Shell",
-    srcs: ["src/**/*.java",":dumpstate_aidl"],
+    srcs: shell_srcs,
     aidl: {
         include_dirs: ["frameworks/native/cmds/dumpstate/binder"],
     },
-    static_libs: ["androidx.legacy_legacy-support-v4"],
+    static_libs: shell_static_libs,
     platform_apis: true,
     certificate: "platform",
     privileged: true,
@@ -12,3 +16,17 @@ android_app {
         include_filter: ["com.android.shell.*"],
     },
 }
+
+// A library for product type like auto to create a new shell package
+// with product specific permissions.
+android_library {
+    name: "Shell-package-library",
+    srcs: shell_srcs,
+    aidl: {
+        include_dirs: ["frameworks/native/cmds/dumpstate/binder"],
+    },
+    resource_dirs: ["res"],
+    static_libs: shell_static_libs,
+    platform_apis: true,
+    manifest: "AndroidManifest.xml",
+}