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

Commit aaa22fd3 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 58ea37fe: am 108ed9fa: Merge "Fix incorrect odex path handling" 

* commit '58ea37fe':
  Fix incorrect odex path handling
parents 498b4a09 58ea37fe

cmds/installd/commands.c

+7 −3
Original line number Diff line number Diff line
@@ -685,10 +685,14 @@ int dexopt(const char *apk_path, uid_t uid, int is_public, 
    /* Before anything else: is there a .odex file?  If so, we have

     * precompiled the apk and there is nothing to do here.

     */

    sprintf(out_path, "%s%s", apk_path, ".odex");

    strcpy(out_path, apk_path);

    end = strrchr(out_path, '.');

    if (end != NULL) {

        strcpy(end, ".odex");

        if (stat(out_path, &dex_stat) == 0) {

            return 0;

        }

    }



    if (create_cache_path(out_path, apk_path)) {

        return -1;