commit 30e2ea4a701d53f28431041af68dc0669e60c569
author Brian Carlstrom <bdc@google.com> Wed Jun 19 23:25:37 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu Jun 20 16:53:02 2013 -0700
tree 55a04655d0896e1d22d41df17d1fed5f6b85396d
parent 0eba633357c6c01b298434c7fd8a5705b5b2e18f

Move art to use dalvik names for .oat files

Change-Id: Ia383c0a0847684a513cab7db44b4ecf8fe05e1c3

src/utils.cc

diff --git a/src/utils.cc b/src/utils.cc
index bb83802..723be92 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -1208,6 +1208,10 @@
     LOG(FATAL) << "Expected path in location to be absolute: "<< location;
   }
   std::string cache_file(location, 1); // skip leading slash
+  if (!IsValidDexFilename(location)) {
+    cache_file += "/";
+    cache_file += DexFile::kClassesDex;
+  }
   std::replace(cache_file.begin(), cache_file.end(), '/', '@');
   return dalvik_cache + "/" + cache_file;
 }
@@ -1225,7 +1229,9 @@
 }
 
 bool IsValidOatFilename(const std::string& filename) {
-  return EndsWith(filename, ".oat");
+  return (EndsWith(filename, ".odex") ||
+          EndsWith(filename, ".oat") ||
+          EndsWith(filename, DexFile::kClassesDex));
 }
 
 }  // namespace art