commit 7675e16bcae06c0fe258aad89b3d511037dec399
author Brian Carlstrom <bdc@google.com> Mon Jun 10 16:18:04 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Jun 10 16:18:04 2013 -0700
tree 7b1ef4555225ba2e6d9b63fe61549c52d291a757
parent 5f4bd97519aad4f075346f8c5c0a84c6105951d8

Rename art-cache to dalvik-cache

Change-Id: I294995066aecc29fbd739c3e9e6f60934f743064

src/utils.cc

diff --git a/src/utils.cc b/src/utils.cc
index 94d812c..bb83802 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -1184,32 +1184,32 @@
   return android_data;
 }
 
-std::string GetArtCacheOrDie(const char* android_data) {
-  std::string art_cache(StringPrintf("%s/art-cache", android_data));
+std::string GetDalvikCacheOrDie(const char* android_data) {
+  std::string dalvik_cache(StringPrintf("%s/dalvik-cache", android_data));
 
-  if (!OS::DirectoryExists(art_cache.c_str())) {
-    if (StartsWith(art_cache, "/tmp/")) {
-      int result = mkdir(art_cache.c_str(), 0700);
+  if (!OS::DirectoryExists(dalvik_cache.c_str())) {
+    if (StartsWith(dalvik_cache, "/tmp/")) {
+      int result = mkdir(dalvik_cache.c_str(), 0700);
       if (result != 0) {
-        LOG(FATAL) << "Failed to create art-cache directory " << art_cache;
+        LOG(FATAL) << "Failed to create dalvik-cache directory " << dalvik_cache;
         return "";
       }
     } else {
-      LOG(FATAL) << "Failed to find art-cache directory " << art_cache;
+      LOG(FATAL) << "Failed to find dalvik-cache directory " << dalvik_cache;
       return "";
     }
   }
-  return art_cache;
+  return dalvik_cache;
 }
 
-std::string GetArtCacheFilenameOrDie(const std::string& location) {
-  std::string art_cache(GetArtCacheOrDie(GetAndroidData()));
+std::string GetDalvikCacheFilenameOrDie(const std::string& location) {
+  std::string dalvik_cache(GetDalvikCacheOrDie(GetAndroidData()));
   if (location[0] != '/') {
     LOG(FATAL) << "Expected path in location to be absolute: "<< location;
   }
   std::string cache_file(location, 1); // skip leading slash
   std::replace(cache_file.begin(), cache_file.end(), '/', '@');
-  return art_cache + "/" + cache_file;
+  return dalvik_cache + "/" + cache_file;
 }
 
 bool IsValidZipFilename(const std::string& filename) {