commit 982f21fec206e1e8100dd0739bb7c5a79a13dc84
author Christopher Ferris <cferris@google.com> Fri Sep 05 17:30:20 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 17:30:21 2014 +0000
tree 810e0325e15005dbaf8fb9945d656c81de4a7096
parent 0ff16cf43a5f8bdeed3fed0d419b6d1151048185
parent 3b2dc9e2253671fd8432fb0b1e18a0b5a38c4dea

Merge "Add new header to support 32 bit/64 bit dumps." into lmp-dev

core/jni/android_ddm_DdmHandleNativeHeap.cpp

diff --git a/core/jni/android_ddm_DdmHandleNativeHeap.cpp b/core/jni/android_ddm_DdmHandleNativeHeap.cpp
index f5eaf94..9b96320 100644
--- a/core/jni/android_ddm_DdmHandleNativeHeap.cpp
+++ b/core/jni/android_ddm_DdmHandleNativeHeap.cpp
@@ -35,7 +35,15 @@
 
 extern "C" void free_malloc_leak_info(uint8_t* info);
 
+#define DDMS_HEADER_SIGNATURE 0x812345dd
+#define DDMS_VERSION 2
+
 struct Header {
+#if defined(__LP64__)
+    uint32_t signature;
+    uint16_t version;
+    uint16_t pointerSize;
+#endif
     size_t mapSize;
     size_t allocSize;
     size_t allocInfoSize;
@@ -77,6 +85,12 @@
     ALOGD("*** mapSize: %d allocSize: %d allocInfoSize: %d totalMemory: %d",
           header.mapSize, header.allocSize, header.allocInfoSize, header.totalMemory);
 
+#if defined(__LP64__)
+    header.signature = DDMS_HEADER_SIGNATURE;
+    header.version = DDMS_VERSION;
+    header.pointerSize = sizeof(void*);
+#endif
+
     jbyteArray array = env->NewByteArray(sizeof(Header) + header.mapSize + header.allocSize);
     if (array != NULL) {
         env->SetByteArrayRegion(array, 0,