commit 8884ef4fe80505bc6e41c167b67efbb93e43475d
author Anwar Ghuloum <anwarg@google.com> Fri Mar 15 12:56:59 2013 -0700
committer Anwar Ghuloum <anwarg@google.com> Thu May 23 12:28:08 2013 -0700
tree 9c72e194797199a2d7f61caecb6acaeacd9e9c31
parent ac5b347d03c52e286f11994699d4e6d462789988

Break out Oat footprint for ram

Breaking out oat footprint in meminfo.

(cherry picked from commit c92f177d96b5952e0bfde01597972fc607aed93a)

Change-Id: I7b0452045c265b7544c41d3a5953e10a081c5315

core/java/android/os/Debug.java

diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index fd01da9..1557644 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -130,7 +130,7 @@
         public int otherSharedDirty;
 
         /** @hide */
-        public static final int NUM_OTHER_STATS = 10;
+        public static final int NUM_OTHER_STATS = 11;
 
         private int[] otherStats = new int[NUM_OTHER_STATS*3];
 
@@ -186,7 +186,8 @@
                 case 6: return ".apk mmap";
                 case 7: return ".ttf mmap";
                 case 8: return ".dex mmap";
-                case 9: return "Other mmap";
+                case 9: return ".oat mmap";
+                case 10: return "Other mmap";
                 default: return "????";
             }
         }

core/jni/android_os_Debug.cpp

diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 2883c10..1e6d53a 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -52,6 +52,7 @@
     HEAP_APK,
     HEAP_TTF,
     HEAP_DEX,
+    HEAP_OAT,
     HEAP_UNKNOWN_MAP,
 
     _NUM_HEAP,
@@ -184,6 +185,8 @@
             } else if ((nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) ||
                        (nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) {
                 whichHeap = HEAP_DEX;
+            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".oat") == 0) {
+                whichHeap = HEAP_OAT;
             } else if (nameLen > 0) {
                 whichHeap = HEAP_UNKNOWN_MAP;
             } else if (start == prevEnd && prevHeap == HEAP_SO) {