commit 196632fb3c59ebbf1184d791a3e7124dd0c3f22b
author android-build-team Robot <android-build-team-robot@google.com> Wed May 30 07:21:55 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 30 07:21:55 2018 +0000
tree 3be7f8888d3c72db350b01b70686ad3efa82c75c
parent 926be82e7c20d0c6d75482002738f24d80c4274c
parent 03cb53a17d47e1a4777672e4ea76afa8e23f1d41

Snap for 4810559 from 03cb53a17d47e1a4777672e4ea76afa8e23f1d41 to pi-release

Change-Id: I8e7369bec8396f574ac8f74f6e471f38c0f95971

libc/malloc_debug/malloc_debug.cpp

diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp
index 6f841ca..e83f73c 100644
--- a/libc/malloc_debug/malloc_debug.cpp
+++ b/libc/malloc_debug/malloc_debug.cpp
@@ -819,7 +819,7 @@
     return false;
   }
 
-  fprintf(fp, "Android Native Heap Dump v1.0\n\n");
+  fprintf(fp, "Android Native Heap Dump v1.1\n\n");
 
   PointerData::DumpLiveToFile(fp);
 

libc/malloc_debug/tests/malloc_debug_unit_tests.cpp

diff --git a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
index 1504d06..f62234b 100644
--- a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
+++ b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
@@ -1311,7 +1311,7 @@
   std::string sanitized(SanitizeHeapData(actual));
 
   std::string expected =
-      "Android Native Heap Dump v1.0\n"
+      "Android Native Heap Dump v1.1\n"
       "\n"
       "Total memory: 405\n"
       "Allocation records: 6\n"
@@ -1383,7 +1383,7 @@
   std::string sanitized(SanitizeHeapData(actual));
 
   std::string expected =
-      "Android Native Heap Dump v1.0\n"
+      "Android Native Heap Dump v1.1\n"
       "\n"
       "Total memory: 1200\n"
       "Allocation records: 3\n"
@@ -1436,7 +1436,7 @@
   std::string sanitized(SanitizeHeapData(actual));
 
   std::string expected =
-      "Android Native Heap Dump v1.0\n"
+      "Android Native Heap Dump v1.1\n"
       "\n"
       "Total memory: 1000\n"
       "Allocation records: 2\n"