commit 0457669b858da2f5c6ed40d14c2ce8597546d90a
author Jay Civelli <jcivelli@google.com> Wed Jul 26 01:53:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 01:53:51 2017 +0000
tree ce481b397e704599e05c63cc5856d4d63389026c
parent 11449a22cb2aa56becac551a01c8f61467f433cb
parent 0601274935e7f632eb0d6ce0fd223b744349d20b

libchrome: Uprev the library to r456626 from Chromium
am: 0601274935

Change-Id: I04c76587e9fb0cdc8f189efe7a12161aee303ec0

Android.bp

diff --git a/Android.bp b/Android.bp
index dbd99c6..ecf12a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -266,7 +266,6 @@
 ]
 
 libchromeLinuxSrc = [
-    "base/allocator/allocator_shim.cc",
     "base/files/file_path_watcher_linux.cc",
     "base/files/file_util_linux.cc",
     "base/memory/shared_memory_posix.cc",
@@ -331,7 +330,6 @@
     target: {
         android: {
             srcs: libchromeLinuxSrc + [
-                "base/allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
                 "base/memory/shared_memory_android.cc",
                 "base/sys_info_chromeos.cc",
             ],
@@ -339,16 +337,10 @@
                 "liblog",
                 "libcutils",
             ],
-            ldflags: [
-                "-Wl,-wrap,calloc",
-                "-Wl,-wrap,free",
-                "-Wl,-wrap,malloc",
-                "-Wl,-wrap,memalign",
-                "-Wl,-wrap,realloc",
-            ],
         },
         linux: {
             srcs: libchromeLinuxSrc + [
+                "base/allocator/allocator_shim.cc",
                 "base/allocator/allocator_shim_default_dispatch_to_glibc.cc"
             ],
             host_ldlibs: ["-lrt"],

base/allocator/features.h

diff --git a/base/allocator/features.h b/base/allocator/features.h
index eedb0b6..ea479cd 100644
--- a/base/allocator/features.h
+++ b/base/allocator/features.h
@@ -6,7 +6,7 @@
 
 #include "build/buildflag.h"
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(ANDROID)
 #define BUILDFLAG_INTERNAL_USE_EXPERIMENTAL_ALLOCATOR_SHIM() (0)
 #else
 #define BUILDFLAG_INTERNAL_USE_EXPERIMENTAL_ALLOCATOR_SHIM() (1)