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

Commit 63235025 authored by Dan Austin's avatar Dan Austin
Browse files

resolve merge conflicts of 1ccaed4d to nyc-dev-plus-aosp 

Change-Id: Ib30c59ff496ed76ec46f4c8f7d954d571bcbf4ae
parents 880e74ef 1ccaed4d

cmds/installd/commands.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1851,7 +1851,6 @@ static bool unlink_and_rename(const char* from, const char* to) { 
        PLOG(ERROR) << "Could not rename " << from << " to " << to;

        return false;

    }



    return true;

}

cmds/installd/installd.cpp

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ bool calculate_oat_file_path(char path[PKG_PATH_MAX], 
                             const char *oat_dir,

                             const char *apk_path,

                             const char *instruction_set) {

    char *file_name_start;

    char *file_name_end;

    const char *file_name_start;

    const char *file_name_end;



    file_name_start = strrchr(apk_path, '/');

    if (file_name_start == NULL) {