diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-30 07:21:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-30 07:21:55 +0000 |
| commit | 196632fb3c59ebbf1184d791a3e7124dd0c3f22b (patch) | |
| tree | 3be7f8888d3c72db350b01b70686ad3efa82c75c | |
| parent | 926be82e7c20d0c6d75482002738f24d80c4274c (diff) | |
| parent | 03cb53a17d47e1a4777672e4ea76afa8e23f1d41 (diff) | |
| download | bionic-pie-r2-release.tar.gz | |
Snap for 4810559 from 03cb53a17d47e1a4777672e4ea76afa8e23f1d41 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-release
Change-Id: I8e7369bec8396f574ac8f74f6e471f38c0f95971
| -rw-r--r-- | libc/malloc_debug/malloc_debug.cpp | 2 | ||||
| -rw-r--r-- | libc/malloc_debug/tests/malloc_debug_unit_tests.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp index 6f841cab5..e83f73c32 100644 --- a/libc/malloc_debug/malloc_debug.cpp +++ b/libc/malloc_debug/malloc_debug.cpp @@ -819,7 +819,7 @@ bool debug_dump_heap(const char* file_name) { 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 1504d06dd..f62234b36 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 @@ void MallocDebugTest::BacktraceDumpOnSignal(bool trigger_with_alloc) { 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 @@ TEST_F(MallocDebugTest, backtrace_dump_on_exit) { 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 @@ TEST_F(MallocDebugTest, backtrace_dump_on_exit_shared_backtrace) { 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" |