commit 866374163a1164e1113a4d2e9e0453d68a06dfa3
author Tom Cherry <tomcherry@google.com> Mon Jul 02 16:02:52 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 02 16:02:52 2018 +0000
tree 315e54eaf2b10a525767c2af9c6402b92eab3224
parent 03cb53a17d47e1a4777672e4ea76afa8e23f1d41
parent 9893d6d0ff2be5a6cdfb944df17b394678a7e340

Merge "Reland "Remove a check for AIDs in the OEM range."" into pi-dev

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"

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index 7877a37..e122d8f 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -105,6 +105,7 @@
         },
         x86: {
             srcs: ["arch/x86/begin.S"],
+            cflags: ["-D__work_around_b_24465209__"],
             version_script: "linker.generic.map",
         },
         x86_64: {