commit caacdf326cfe09decfca0a15c62ebe10b774e05e
author Anwar Ghuloum <anwarg@google.com> Thu Sep 19 17:29:21 2013 -0700
committer Anwar Ghuloum <anwarg@google.com> Thu Sep 19 17:34:13 2013 -0700
tree d1f0fe587a4d19ba613226fdbde8c3b9f87d70b4
parent 0f72e4136aecaf6976fdb55916bbd7b6d5c9c77b

Fix dumpsys meminfo for art

BUG:10112253
Change-Id: I2a34cc0841bdcf922c4ab4eadda360313858a0d6

runtime/utils.cc

diff --git a/runtime/utils.cc b/runtime/utils.cc
index 4c17914..dcfe8a7 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -1196,7 +1196,7 @@
     LOG(FATAL) << "Expected path in location to be absolute: "<< location;
   }
   std::string cache_file(location, 1);  // skip leading slash
-  if (!IsValidDexFilename(location)) {
+  if (!IsValidDexFilename(location) && !IsValidImageFilename(location)) {
     cache_file += "/";
     cache_file += DexFile::kClassesDex;
   }
@@ -1216,6 +1216,10 @@
   return EndsWith(filename, ".dex");
 }
 
+bool IsValidImageFilename(const std::string& filename) {
+  return EndsWith(filename, ".art");
+}
+
 bool IsValidOatFilename(const std::string& filename) {
   return (EndsWith(filename, ".odex") ||
           EndsWith(filename, ".dex") ||

runtime/utils.h

diff --git a/runtime/utils.h b/runtime/utils.h
index fcbb992..c506fba 100644
--- a/runtime/utils.h
+++ b/runtime/utils.h
@@ -356,6 +356,7 @@
 // Check whether the given filename has a valid extension
 bool IsValidZipFilename(const std::string& filename);
 bool IsValidDexFilename(const std::string& filename);
+bool IsValidImageFilename(const std::string& filename);
 bool IsValidOatFilename(const std::string& filename);
 
 class VoidFunctor {