Merge "Fix module-file name collisions"

2022-09-02 03:47:45 +00:00
parent 47653ee99d d633c8e430
commit 92f4e14b94
6 changed files with 3 additions and 3 deletions
--- a/cmds/am/Android.bp
+++ b/cmds/am/Android.bp
@@ -30,7 +30,7 @@ cc_library_host_static {
 java_binary {
    name: "am",
-    wrapper: "am",
+    wrapper: "am.sh",
    srcs: [
        "src/**/*.java",
        "proto/**/*.proto",
--- a/cmds/am/am.sh
+++ b/cmds/am/am.sh
--- a/cmds/appops/Android.bp
+++ b/cmds/appops/Android.bp
@@ -19,5 +19,5 @@ license {
 sh_binary {
    name: "appops",
-    src: "appops",
+    src: "appops.sh",
 }
--- a/cmds/appops/appops.sh
+++ b/cmds/appops/appops.sh
--- a/cmds/appwidget/Android.bp
+++ b/cmds/appwidget/Android.bp
@@ -19,6 +19,6 @@ license {
 java_binary {
    name: "appwidget",
-    wrapper: "appwidget",
+    wrapper: "appwidget.sh",
    srcs: ["**/*.java"],
 }
--- a/cmds/appwidget/appwidget.sh
+++ b/cmds/appwidget/appwidget.sh