diff options
| author | ctso <ctsoyars@gmail.com> | 2010-06-24 00:45:22 +0000 |
|---|---|---|
| committer | ctso <ctsoyars@gmail.com> | 2010-06-24 00:45:23 +0000 |
| commit | 1a3ddc6126a1008bdf2e958d4e0ef7754a4f0d6d (patch) | |
| tree | fdaac1dea760b87e2427b94eb5fc020e344df109 | |
| parent | 9747a8b956760e258cbb6d9f4950e0b3e8bf02ff (diff) | |
| download | frameworks_base-1a3ddc6126a1008bdf2e958d4e0ef7754a4f0d6d.zip frameworks_base-1a3ddc6126a1008bdf2e958d4e0ef7754a4f0d6d.tar.gz frameworks_base-1a3ddc6126a1008bdf2e958d4e0ef7754a4f0d6d.tar.bz2 | |
Revert installd changes to dexopt on /cache until we figure out what is going on.
| -rw-r--r-- | cmds/installd/commands.c | 15 | ||||
| -rw-r--r-- | cmds/installd/installd.h | 1 |
2 files changed, 3 insertions, 13 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 8d571dc..cce7c13 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -405,7 +405,6 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src) char *tmp; int srclen; int dstlen; - char dexopt_data_only[PROPERTY_VALUE_MAX]; srclen = strlen(src); @@ -418,15 +417,7 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src) return -1; } - const char *cache_path = DALVIK_CACHE_PREFIX; - if (!strncmp(src, "/system", 7)) { - property_get("dalvik.vm.dexopt-data-only", dexopt_data_only, ""); - if (strcmp(dexopt_data_only, "1") != 0) { - cache_path = DALVIK_SYSTEM_CACHE_PREFIX; - } - } - - dstlen = srclen + strlen(cache_path) + + dstlen = srclen + strlen(DALVIK_CACHE_PREFIX) + strlen(DALVIK_CACHE_POSTFIX) + 1; if (dstlen > PKG_PATH_MAX) { @@ -434,11 +425,11 @@ int create_cache_path(char path[PKG_PATH_MAX], const char *src) } sprintf(path,"%s%s%s", - cache_path, + DALVIK_CACHE_PREFIX, src + 1, /* skip the leading / */ DALVIK_CACHE_POSTFIX); - for(tmp = path + strlen(cache_path); *tmp; tmp++) { + for(tmp = path + strlen(DALVIK_CACHE_PREFIX); *tmp; tmp++) { if (*tmp == '/') { *tmp = '@'; } diff --git a/cmds/installd/installd.h b/cmds/installd/installd.h index ddefc6f..cfcdb98 100644 --- a/cmds/installd/installd.h +++ b/cmds/installd/installd.h @@ -67,7 +67,6 @@ #define DALVIK_CACHE_POSTFIX "/classes.dex" #define UPDATE_COMMANDS_DIR_PREFIX "/system/etc/updatecmds/" -#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 */ |