diff options
| author | Mark Urbanus <urbanus@google.com> | 2016-12-15 14:57:31 -0800 |
|---|---|---|
| committer | Mark Urbanus <urbanus@google.com> | 2016-12-16 09:57:04 -0800 |
| commit | 8146cc11b4da1427aa76ef1f9473d21bfea967f7 (patch) | |
| tree | bc8c1f325531706892529e65feedbd26208301a9 | |
| parent | 7f65e83691c47df7d34e65ee18b71dc4a2aa7046 (diff) | |
| download | libchrome-8146cc11b4da1427aa76ef1f9473d21bfea967f7.tar.gz | |
Disable experimental allocator shim for Android
Disable the experimental allocator shim on Android builds.
At this point we haven't identified a need for it and
prevents us from having to update the linker flags for
the many projects that have libchrome as a dependency.
Bug: 33239390
Test: Validated libchrome dependents (update_engine) can be built properly
without adding the -wrap* linker flags
Change-Id: I4e7e914883dfbc08b7eab9e0e175c14e59e386eb
| -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 d07ab2908c..dbab1cc1ef 100644 --- a/Android.bp +++ b/Android.bp @@ -243,7 +243,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", @@ -307,7 +306,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", ], @@ -315,16 +313,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) |