From d633c8e430c70fb37d174941c59826313c6ba5b0 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Thu, 1 Sep 2022 15:04:37 -0700
Subject: [PATCH] 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
---
 cmds/am/Android.bp                         | 2 +-
 cmds/am/{am => am.sh}                      | 0
 cmds/appops/Android.bp                     | 2 +-
 cmds/appops/{appops => appops.sh}          | 0
 cmds/appwidget/Android.bp                  | 2 +-
 cmds/appwidget/{appwidget => appwidget.sh} | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename cmds/am/{am => am.sh} (100%)
 rename cmds/appops/{appops => appops.sh} (100%)
 rename cmds/appwidget/{appwidget => appwidget.sh} (100%)

diff --git a/cmds/am/Android.bp b/cmds/am/Android.bp
index 7bb9675ede37e..c6cc7c55dae33 100644
--- 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",
diff --git a/cmds/am/am b/cmds/am/am.sh
similarity index 100%
rename from cmds/am/am
rename to cmds/am/am.sh
diff --git a/cmds/appops/Android.bp b/cmds/appops/Android.bp
index 80f8ec6792471..538ae941548ec 100644
--- a/cmds/appops/Android.bp
+++ b/cmds/appops/Android.bp
@@ -19,5 +19,5 @@ license {
 
 sh_binary {
     name: "appops",
-    src: "appops",
+    src: "appops.sh",
 }
diff --git a/cmds/appops/appops b/cmds/appops/appops.sh
similarity index 100%
rename from cmds/appops/appops
rename to cmds/appops/appops.sh
diff --git a/cmds/appwidget/Android.bp b/cmds/appwidget/Android.bp
index 8049038de809c..cd439e2753e9a 100644
--- 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"],
 }
diff --git a/cmds/appwidget/appwidget b/cmds/appwidget/appwidget.sh
similarity index 100%
rename from cmds/appwidget/appwidget
rename to cmds/appwidget/appwidget.sh