From 7e279e97a3b8ac43fe93f9f3f8287a6965f7fb30 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Mon, 5 Sep 2022 18:12:42 -0700
Subject: [PATCH] Fix module-file name collisions

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

Bug: 198619163
Test: Presubmits
Change-Id: I345086764071ca649de1ac11804e21675cd5e59d
---
 fs_mgr/tests/Android.bp | 5 +++--
 init/Android.bp         | 5 +++--
 libsparse/Android.bp    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fs_mgr/tests/Android.bp b/fs_mgr/tests/Android.bp
index fdc0d8eef..b9bae2513 100644
--- a/fs_mgr/tests/Android.bp
+++ b/fs_mgr/tests/Android.bp
@@ -53,8 +53,9 @@ cc_test {
 }
 
 sh_binary_host {
-    name: "adb-remount-test.sh",
+    name: "adb-remount-test",
     src: "adb-remount-test.sh",
+    filename_from_src: true,
     target: {
         darwin: {
             enabled: false,
@@ -68,7 +69,7 @@ sh_binary_host {
 sh_test {
     name: "adb-remount-sh",
     src: "adb-remount-test.sh",
-    filename: "adb-remount-test.sh",
+    filename_from_src: true,
     test_suites: ["general-tests"],
     test_config: "adb-remount-sh.xml",
 }
diff --git a/init/Android.bp b/init/Android.bp
index 20d622d6b..6255305ce 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -276,7 +276,7 @@ cc_binary {
                 "init.rc",
                 "ueventd.rc",
                 "e2fsdroid",
-                "extra_free_kbytes.sh",
+                "extra_free_kbytes",
                 "make_f2fs",
                 "mke2fs",
                 "sload_f2fs",
@@ -609,6 +609,7 @@ cc_library_host_static {
 }
 
 sh_binary {
-    name: "extra_free_kbytes.sh",
+    name: "extra_free_kbytes",
     src: "extra_free_kbytes.sh",
+    filename_from_src: true,
 }
diff --git a/libsparse/Android.bp b/libsparse/Android.bp
index 5d4157aea..8e83e1670 100644
--- a/libsparse/Android.bp
+++ b/libsparse/Android.bp
@@ -80,7 +80,7 @@ cc_binary_host {
 }
 
 python_binary_host {
-    name: "simg_dump.py",
+    name: "simg_dump",
     main: "simg_dump.py",
     srcs: ["simg_dump.py"],
     version: {