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

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

Merge "Fix module-file name collisions" am: b0b42025 am: 353bf7e4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2202568



Change-Id: I088e509e83076d9390b5a646c59c75bfef6fea43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c60e32d5 353bf7e4

cmds/installd/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,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
@@ -300,6 +300,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
@@ -3708,7 +3708,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";

    }