diff options
| -rw-r--r-- | Android.bp | 10 | ||||
| -rw-r--r-- | base/allocator/features.h | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp index f17bd9bd48..6f60b34b95 100644 --- a/Android.bp +++ b/Android.bp @@ -244,7 +244,6 @@ libchromeCommonSrc = [ ] 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", @@ -308,7 +307,6 @@ cc_library { 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", ], @@ -316,16 +314,10 @@ cc_library { "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"], diff --git a/base/allocator/features.h b/base/allocator/features.h index eedb0b6f0b..ea479cd5a0 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) |