Merge "Fix incorrect odex path handling" (108ed9fa) · Commits · e / os / platform_frameworks_native

cmds/installd/commands.c

+7 −3

Original line number	Original line	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		/* Before anything else: is there a .odex file? If so, we have
	* precompiled the apk and there is nothing to do here.		* 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) {		if (stat(out_path, &dex_stat) == 0) {
	return 0;		return 0;
	}		}
			}

	if (create_cache_path(out_path, apk_path)) {		if (create_cache_path(out_path, apk_path)) {
	return -1;		return -1;