commit e88c0d9ec374ec4dcca6ccd8d440610ea83622c9
author Ian Rogers <irogers@google.com> Mon Feb 25 17:13:23 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 25 17:13:24 2013 +0000
tree 63f69c7dce60114cc51c69774f36792fdd7657eb
parent d61ff77ee10b2c956df153e08b850e852ff5df57
parent 9f8589c31f8910a9c3c33a81675822da9f0cf2df

Merge "Recognize odex files in memory accounting."

core/jni/android_os_Debug.cpp

diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 56b687c..6e21a11 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -178,7 +178,8 @@
                 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;