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

Commit f6cd58ad authored by Cole Faust's avatar Cole Faust
Browse files

Fix module-file name collisions 

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

Bug: 198619163
Test: adb root; adb shell /system/bin/migrate_legacy_obb_data; adb logcat | grep obb shows "migrate_legacy_obb_data: No legacy obb data to migrate."
Change-Id: I1b5d57e6d3b2cf6f16f1d4b5039172e34be46d70
parent ec6c073a

cmds/installd/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ cc_binary { 


    // Needs to be wherever installd is as it's execed by

    // installd.

    required: ["migrate_legacy_obb_data.sh"],

    required: ["migrate_legacy_obb_data"],

}



// OTA chroot tool
@@ -299,6 +299,6 @@ sh_binary { 


// Script to migrate legacy obb data.

sh_binary {

    name: "migrate_legacy_obb_data.sh",

    name: "migrate_legacy_obb_data",

    src: "migrate_legacy_obb_data.sh",

}

cmds/installd/InstalldNativeService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3709,7 +3709,7 @@ binder::Status InstalldNativeService::migrateLegacyObbData() { 
    ENFORCE_UID(AID_SYSTEM);

    // NOTE: The lint warning doesn't apply to the use of system(3) with

    // absolute parse and no command line arguments.

    if (system("/system/bin/migrate_legacy_obb_data.sh") != 0) { // NOLINT(cert-env33-c)

    if (system("/system/bin/migrate_legacy_obb_data") != 0) { // NOLINT(cert-env33-c)

        LOG(ERROR) << "Unable to migrate legacy obb data";

    }