From caacdf326cfe09decfca0a15c62ebe10b774e05e Mon Sep 17 00:00:00 2001
From: Anwar Ghuloum <anwarg@google.com>
Date: Thu, 19 Sep 2013 17:29:21 -0700
Subject: Fix dumpsys meminfo for art

BUG:10112253
Change-Id: I2a34cc0841bdcf922c4ab4eadda360313858a0d6
---
 runtime/utils.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime/utils.cc')

diff --git a/runtime/utils.cc b/runtime/utils.cc
index 4c17914265..dcfe8a75c2 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -1196,7 +1196,7 @@ std::string GetDalvikCacheFilenameOrDie(const std::string& location) {
     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 @@ bool IsValidDexFilename(const std::string& filename) {
   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") ||
-- 
cgit v1.2.3-59-g8ed1b