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

Commit d633c8e4 authored by Cole Faust's avatar Cole Faust
Browse files

Fix module-file name collisions 

Bazel doesn't allow a module and file with the same name.

These are some extra modules I missed in aosp/2201115

Bug: 198619163
Test: m am, verified it was still installed to out/target/product/emulator64_x86_64/system/bin/am and not am.sh
Change-Id: I763a938918854541ec5b0bcf740b1b6cf0fce771
parent 565f2ab1

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

}