diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-23 00:26:22 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:53:27 +0200 |
| commit | ec2daa8dc96bfc275b1d13a7ac880940f506f71e (patch) | |
| tree | 401d750381d6cb45082d885a72f75c50e0c74ba5 /memory/build/mozmemory_wrap.h | |
| parent | 44c169c9be3cec6957d5b04272a3564cf9137109 (diff) | |
| download | UXP-ec2daa8dc96bfc275b1d13a7ac880940f506f71e.tar UXP-ec2daa8dc96bfc275b1d13a7ac880940f506f71e.tar.gz UXP-ec2daa8dc96bfc275b1d13a7ac880940f506f71e.tar.lz UXP-ec2daa8dc96bfc275b1d13a7ac880940f506f71e.tar.xz UXP-ec2daa8dc96bfc275b1d13a7ac880940f506f71e.zip | |
Issue #1053 - Remove android support from memory
Diffstat (limited to 'memory/build/mozmemory_wrap.h')
| -rw-r--r-- | memory/build/mozmemory_wrap.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/memory/build/mozmemory_wrap.h b/memory/build/mozmemory_wrap.h index bb1d339ba..da4fd27bb 100644 --- a/memory/build/mozmemory_wrap.h +++ b/memory/build/mozmemory_wrap.h @@ -58,13 +58,8 @@ * zone allocator anyways. Jemalloc-specific functions are also left * unprefixed. * - * - On Android and Gonk, all functions are left unprefixed. Additionally, - * C++ allocation functions (operator new/delete) are also exported and - * unprefixed. - * * - On other systems (mostly Linux), all functions are left unprefixed. * - * Only Android and Gonk add C++ allocation functions. * * Proper exporting of the various functions is done with the MOZ_MEMORY_API * and MOZ_JEMALLOC_API macros. MOZ_MEMORY_API is meant to be used for malloc @@ -72,14 +67,6 @@ * dedicated to jemalloc specific functions. * * - * All these functions are meant to be called with no prefix from Gecko code. - * In most cases, this is because that's how they are available at runtime. - * However, on Android, this relies on faulty.lib (the custom dynamic linker) - * resolving mozglue symbols before libc symbols, which is guaranteed by the - * way faulty.lib works (it respects the DT_NEEDED order, and libc always - * appears after mozglue ; which we double check when building anyways) - * - * * Within libmozglue (when MOZ_MEMORY_IMPL is defined), all the functions * should be suffixed with "_impl" both for declarations and use. * That is, the implementation declaration for e.g. strdup would look like: @@ -133,9 +120,6 @@ # endif # else # define MOZ_MEMORY_API MFBT_API -# if defined(MOZ_WIDGET_ANDROID) -# define MOZ_WRAP_NEW_DELETE -# endif # endif # endif # ifdef XP_WIN @@ -184,15 +168,6 @@ # define wcsdup_impl mozmem_dup_impl(wcsdup) #endif -/* String functions */ -#ifdef ANDROID -/* Bug 801571 and Bug 879668, libstagefright uses vasprintf, causing malloc()/ - * free() to be mismatched between bionic and mozglue implementation. - */ -#define vasprintf_impl mozmem_dup_impl(vasprintf) -#define asprintf_impl mozmem_dup_impl(asprintf) -#endif - /* Jemalloc specific function */ #define jemalloc_stats_impl mozmem_jemalloc_impl(jemalloc_stats) #define jemalloc_purge_freed_pages_impl mozmem_jemalloc_impl(jemalloc_purge_freed_pages) |