Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81eb4424 authored by Keun-young Park's avatar Keun-young Park Committed by Android (Google) Code Review
Browse files

Merge changes from topic "carshell" 

* changes:
  add Shell-package-library to allow product type level update
  Change target package for com.android.car.shell
parents fd763b65 bd16eb52

data/etc/car/com.android.car.shell.xml

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
  ~ limitations under the License

  -->

<permissions>

    <privapp-permissions package="com.android.car.shell">

    <!-- CarShell now overrides the shell package and adding permission here

         is ok. -->

    <privapp-permissions package="com.android.shell">

        <permission name="android.permission.INSTALL_PACKAGES" />

        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>

    </privapp-permissions>

packages/Shell/Android.bp

+21 −2
Original line number Diff line number Diff line 
// 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",

    defaults: ["platform_app_defaults"],

    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,
@@ -13,3 +17,18 @@ 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",

    defaults: ["platform_app_defaults"],

    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",

}