diff options
| -rw-r--r-- | cmds/installd/installd.cpp | 6 | ||||
| -rw-r--r-- | cmds/installd/installd_constants.h | 3 | ||||
| -rw-r--r-- | cmds/installd/otapreopt.cpp | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/cmds/installd/installd.cpp b/cmds/installd/installd.cpp index 2bc3dfa183..531c6df200 100644 --- a/cmds/installd/installd.cpp +++ b/cmds/installd/installd.cpp @@ -151,12 +151,11 @@ bool create_cache_path(char path[PKG_PATH_MAX], return false; } - sprintf(path,"%s%s/%s/%s%s", + sprintf(path,"%s%s/%s/%s", android_data_dir.path, DALVIK_CACHE, instruction_set, - src + 1, /* skip the leading / */ - DALVIK_CACHE_POSTFIX); + src + 1 /* skip the leading / */); char* tmp = path + @@ -171,6 +170,7 @@ bool create_cache_path(char path[PKG_PATH_MAX], } } + strcat(path, DALVIK_CACHE_POSTFIX); return true; } diff --git a/cmds/installd/installd_constants.h b/cmds/installd/installd_constants.h index 41732cce4f..b0bcce911a 100644 --- a/cmds/installd/installd_constants.h +++ b/cmds/installd/installd_constants.h @@ -28,8 +28,7 @@ constexpr const char* SECONDARY_USER_PREFIX = "user/"; // This is used as a string literal, can't be constants. TODO: std::string... #define DALVIK_CACHE "dalvik-cache" -constexpr const char* DALVIK_CACHE_POSTFIX = "/classes.dex"; -constexpr const char* DALVIK_CACHE_POSTFIX2 = "@classes.dex"; +constexpr const char* DALVIK_CACHE_POSTFIX = "@classes.dex"; constexpr size_t PKG_NAME_MAX = 128u; /* largest allowed package name */ constexpr size_t PKG_PATH_MAX = 256u; /* max size of any path we use */ diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp index 5fa972a4de..7e02b6bcfc 100644 --- a/cmds/installd/otapreopt.cpp +++ b/cmds/installd/otapreopt.cpp @@ -823,7 +823,7 @@ bool create_cache_path(char path[PKG_PATH_MAX], DALVIK_CACHE, instruction_set, from_src.c_str(), - DALVIK_CACHE_POSTFIX2); + DALVIK_CACHE_POSTFIX); if (assembled_path.length() + 1 > PKG_PATH_MAX) { return false; |