Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 363eb134 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix module-file name collisions" am: 7cad2e86 am: 1806deb5 

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



Change-Id: I61ca1630f9b2746fdc951be96fa2729f9174be13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35dd0ef2 1806deb5

fs_mgr/tests/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -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",

}

init/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -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,

}

libsparse/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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: {