DO NOT MERGE: Move to version v1.1.
The new malloc debug sets the num allocations field to non-zero.
Unfortunately, an old version of malloc debug incorrectly set this field.
In order to differentiate between the broken output, increment the version
number.
Bug: 74361929
Test: Ran unit tests.
Change-Id: Ia88300e324fe9d46aae0c93079ee926e088e675e
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);
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"