From 7bfa86ddf31a961a61e2994fe771345acd1717b4 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Wed, 11 Jun 2014 18:29:07 -0700 Subject: consolidate profiles and profile-cache Ownership problems originally prevented using the same directory for /data/dalvik-cache/profiles and /data/dalvik-cache/profile-cache. Now that ownership is assigned via init.rc, we can consolidate these two directories. Old profile files are stored in /data/dalvik-cache/profiles/ with the "@old" extension. We use "@" instead of "." to avoid conflicts should someone create a package ending in ".old". Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3 --- runtime/native/dalvik_system_DexFile.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'runtime/native') diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index 7e3810c..9512a5a 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -340,16 +340,7 @@ static jboolean IsDexOptNeededInternal(JNIEnv* env, const char* filename, if (Runtime::Current()->GetProfilerOptions().IsEnabled() && (pkgname != nullptr)) { const std::string profile_file = GetDalvikCacheOrDie("profiles", false /* create_if_absent */) + std::string("/") + pkgname; - const std::string profile_cache_dir = GetDalvikCacheOrDie("profile-cache", - false /* create_if_absent */); - - // Make the profile cache if it doesn't exist. - mkdir(profile_cache_dir.c_str(), 0700); - - // The previous profile file (a copy of the profile the last time this was run) is - // in the dalvik-cache directory because this is owned by system. The profiles - // directory is owned by install so system cannot write files in there. - std::string prev_profile_file = profile_cache_dir + std::string("/") + pkgname; + const std::string prev_profile_file = profile_file + std::string("@old"); struct stat profstat, prevstat; int e1 = stat(profile_file.c_str(), &profstat); -- cgit v1.1