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

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

Merge "Fix module-file name collisions" am: cdaa8466 am: eb143ce8 

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



Change-Id: Ia2564a3d1c718da14b12ba14328918499615d458
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91d6c5b5 eb143ce8

cmds/abx/Android.bp

+3 −4
Original line number Diff line number Diff line 


package {

    default_applicable_licenses: ["frameworks_base_cmds_abx_license"],

}
@@ -18,7 +17,7 @@ license { 


java_binary {

    name: "abx",

    wrapper: "abx",

    wrapper: "abx.sh",

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

    required: [

        "abx2xml",
@@ -28,10 +27,10 @@ java_binary { 


sh_binary {

    name: "abx2xml",

    src: "abx2xml",

    src: "abx2xml.sh",

}



sh_binary {

    name: "xml2abx",

    src: "xml2abx",

    src: "xml2abx.sh",

}

cmds/abx/abx→cmds/abx/abx.sh

+0 −0

File moved.

View file

cmds/abx/abx2xml→cmds/abx/abx2xml.sh

+0 −0

File moved.

View file

cmds/abx/xml2abx→cmds/abx/xml2abx.sh

+0 −0

File moved.

View file

cmds/bmgr/Android.bp

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


java_binary {

    name: "bmgr",

    wrapper: "bmgr",

    wrapper: "bmgr.sh",

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

}