commit fec1178bbf7a2222d15a9710db58a248ec85eca2
author Ian Rogers <irogers@google.com> Mon Feb 25 18:09:55 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 25 18:09:55 2013 +0000
tree 50b3c3044e8a7a7294d7b10889f3143c29f15eb0
parent ff4fcdb98c9575642c48f1daeafff4b257769e81
parent 92f3e9a1fba2873c00d1d89179c051a82e924d76

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

* commit '92f3e9a1fba2873c00d1d89179c051a82e924d76':
  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;