am 92f3e9a1: am e88c0d9e: Merge "Recognize odex files in memory accounting."

* commit '92f3e9a1fba2873c00d1d89179c051a82e924d76':
  Recognize odex files in memory accounting.

1 files changed, 2 insertions, 1 deletions

diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 56b687c892b1..6e21a1123e7b 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -178,7 +178,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
                 whichHeap = HEAP_APK;
             } else if (nameLen > 4 && strcmp(name+nameLen-4, ".ttf") == 0) {
                 whichHeap = HEAP_TTF;
-            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) {
+            } else if ((nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) ||
+                       (nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) {
                 whichHeap = HEAP_DEX;
             } else if (nameLen > 0) {
                 whichHeap = HEAP_UNKNOWN_MAP;