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

Commit d6162bab authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Fix module-file name collisions" am: 92f4e14b am: b88cb3e1 am:... 

Merge "Fix module-file name collisions" am: 92f4e14b am: b88cb3e1 am: 1d4139e7 am: 645e261b am: 0bb48ec2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202594



Change-Id: Ia7f35d868f69e4c6c0f6d0712a21ceb2b313eff7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce2f7ef7 0bb48ec2

cmds/am/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cc_library_host_static { 


java_binary {

    name: "am",

    wrapper: "am",

    wrapper: "am.sh",

    srcs: [

        "src/**/*.java",

        "proto/**/*.proto",

cmds/am/am→cmds/am/am.sh

+0 −0

File moved.

View file

cmds/appops/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ license { 


sh_binary {

    name: "appops",

    src: "appops",

    src: "appops.sh",

}

cmds/appops/appops→cmds/appops/appops.sh

+0 −0

File moved.

View file

cmds/appwidget/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ license { 


java_binary {

    name: "appwidget",

    wrapper: "appwidget",

    wrapper: "appwidget.sh",

    srcs: ["**/*.java"],

}