commit 1806deb5d41dc481615acc60e62f54eca893ad09
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 21 22:23:42 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 21 22:23:42 2022 +0000
tree 6e4b8e44ff8c3b5c2d93f3285c049d075c9c11e9
parent 978c70eccbb959ca0d88992ff5ac23b443e8abad
parent 7cad2e86543b451945f7359b62ab43bb43879db4

Merge "Fix module-file name collisions" am: 7cad2e8654

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2205530

Change-Id: Icf100d7036ab32f2db3c14c22da92d4f84be2af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/tests/Android.bp

diff --git a/fs_mgr/tests/Android.bp b/fs_mgr/tests/Android.bp
index fdc0d8e..b9bae25 100644
--- a/fs_mgr/tests/Android.bp
+++ b/fs_mgr/tests/Android.bp
@@ -53,8 +53,9 @@
 }
 
 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_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",
 }

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 20d622d..6255305 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -276,7 +276,7 @@
                 "init.rc",
                 "ueventd.rc",
                 "e2fsdroid",
-                "extra_free_kbytes.sh",
+                "extra_free_kbytes",
                 "make_f2fs",
                 "mke2fs",
                 "sload_f2fs",
@@ -609,6 +609,7 @@
 }
 
 sh_binary {
-    name: "extra_free_kbytes.sh",
+    name: "extra_free_kbytes",
     src: "extra_free_kbytes.sh",
+    filename_from_src: true,
 }

libsparse/Android.bp

diff --git a/libsparse/Android.bp b/libsparse/Android.bp
index 5d4157a..8e83e16 100644
--- a/libsparse/Android.bp
+++ b/libsparse/Android.bp
@@ -80,7 +80,7 @@
 }
 
 python_binary_host {
-    name: "simg_dump.py",
+    name: "simg_dump",
     main: "simg_dump.py",
     srcs: ["simg_dump.py"],
     version: {