Use /cache/dalvik-cache for system dex files. (3ac1695c) · Commits · e / os / android_frameworks_base

cmds/installd/commands.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -393,7 +393,9 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src)
		return -1;
		}

		dstlen = srclen + strlen(DALVIK_CACHE_PREFIX) +
		const char *cache_path = strncmp(src, "/system", 7) ? DALVIK_CACHE_PREFIX : DALVIK_SYSTEM_CACHE_PREFIX;

		dstlen = srclen + strlen(cache_path) +
		strlen(DALVIK_CACHE_POSTFIX) + 1;

		if (dstlen > PKG_PATH_MAX) {
		@@ -401,11 +403,11 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src)
		}

		sprintf(path,"%s%s%s",
		DALVIK_CACHE_PREFIX,
		cache_path,
		src + 1, /* skip the leading / */
		DALVIK_CACHE_POSTFIX);

		for(tmp = path + strlen(DALVIK_CACHE_PREFIX); *tmp; tmp++) {
		for(tmp = path + strlen(cache_path); *tmp; tmp++) {
		if (*tmp == '/') {
		*tmp = '@';
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@

		#define DALVIK_CACHE_PREFIX "/data/dalvik-cache/"
		#define DALVIK_CACHE_POSTFIX "/classes.dex"

		#define DALVIK_SYSTEM_CACHE_PREFIX "/cache/dalvik-cache/"

		#define PKG_NAME_MAX 128 /* largest allowed package name */
		#define PKG_PATH_MAX 256 /* max size of any path we use */