Merge "Fix incorrect odex path handling"

This commit is contained in:
Brian Carlstrom 2014-04-28 22:00:35 +00:00 committed by Gerrit Code Review
commit 108ed9fa94

View File

@ -685,9 +685,13 @@ 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");
if (stat(out_path, &dex_stat) == 0) {
return 0;
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)) {