commit 325fb3e2aac104d7090dd4978356920875c61ee0
author Cole Faust <colefaust@google.com> Mon Aug 29 15:15:53 2022 -0700
committer Cole Faust <colefaust@google.com> Mon Aug 29 18:42:32 2022 -0700
tree 8ac3fffa92a70d86765b1e66dd69895ea08b80cf
parent 7d825e68805ead1f6862562d48f93546567e4c39

Fix module-file name collisions

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

Bug: 198619163
Test: m ime, verified it was still installed to out/target/product/emulator64_x86_64/system/bin/ime and not ime.sh
Change-Id: I214e190e159a7aff9149e77146d1a493992e885d

cmds/abx/Android.bp

diff --git a/cmds/abx/Android.bp b/cmds/abx/Android.bp
index 50a0b75..a832dea 100644
--- a/cmds/abx/Android.bp
+++ b/cmds/abx/Android.bp
@@ -1,4 +1,3 @@
-
 package {
     default_applicable_licenses: ["frameworks_base_cmds_abx_license"],
 }
@@ -18,7 +17,7 @@
 
 java_binary {
     name: "abx",
-    wrapper: "abx",
+    wrapper: "abx.sh",
     srcs: ["**/*.java"],
     required: [
         "abx2xml",
@@ -28,10 +27,10 @@
 
 sh_binary {
     name: "abx2xml",
-    src: "abx2xml",
+    src: "abx2xml.sh",
 }
 
 sh_binary {
     name: "xml2abx",
-    src: "xml2abx",
+    src: "xml2abx.sh",
 }