Issue #1053 - Remove android support from memory

3 files changed, 3 insertions, 42 deletions

diff --git a/memory/replace/logalloc/LogAlloc.cpp b/memory/replace/logalloc/LogAlloc.cpp
index f9b3750489..6491dba990 100644
--- a/memory/replace/logalloc/LogAlloc.cpp
+++ b/memory/replace/logalloc/LogAlloc.cpp
@@ -54,16 +54,6 @@ GetTid()
 #endif
 }
 
-#ifdef ANDROID
-/* See mozglue/android/APKOpen.cpp */
-extern "C" MOZ_EXPORT __attribute__((weak))
-void* __dso_handle;
-
-/* Android doesn't have pthread_atfork defined in pthread.h */
-extern "C" MOZ_EXPORT
-int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
-#endif
-
 class LogAllocBridge : public ReplaceMallocBridge
 {
   virtual void InitDebugFd(mozilla::DebugFdRegistry& aRegistry) override {
diff --git a/memory/replace/logalloc/moz.build b/memory/replace/logalloc/moz.build
index e549dca763..7a60a8afa0 100644
--- a/memory/replace/logalloc/moz.build
+++ b/memory/replace/logalloc/moz.build
@@ -20,22 +20,10 @@ DEFINES['DEBUG'] = False
 
 # Use locking code from the chromium stack.
 if CONFIG['OS_TARGET'] == 'WINNT':
-    SOURCES += [
-        '../../../ipc/chromium/src/base/lock_impl_win.cc',
-    ]
+    SOURCES += ['../../../ipc/chromium/src/base/lock_impl_win.cc']
 else:
-    SOURCES += [
-        '../../../ipc/chromium/src/base/lock_impl_posix.cc',
-    ]
+    SOURCES += ['../../../ipc/chromium/src/base/lock_impl_posix.cc']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-# Android doesn't have pthread_atfork, but we have our own in mozglue.
-if CONFIG['OS_TARGET'] == 'Android':
-    USE_LIBS += [
-        'mozglue',
-    ]
-
-DIRS += [
-    'replay',
-]
+DIRS += ['replay']
diff --git a/memory/replace/logalloc/replay/Replay.cpp b/memory/replace/logalloc/replay/Replay.cpp
index 0ae20de2cc..de352189cf 100644
--- a/memory/replace/logalloc/replay/Replay.cpp
+++ b/memory/replace/logalloc/replay/Replay.cpp
@@ -290,23 +290,6 @@ MOZ_BEGIN_EXTERN_C
 void malloc_init_hard(void);
 #endif
 
-#ifdef ANDROID
-/* mozjemalloc uses MozTagAnonymousMemory, which doesn't have an inline
- * implementation on Android */
-void
-MozTagAnonymousMemory(const void* aPtr, size_t aLength, const char* aTag) {}
-
-/* mozjemalloc and jemalloc use pthread_atfork, which Android doesn't have.
- * While gecko has one in libmozglue, the replay program can't use that.
- * Since we're not going to fork anyways, make it a dummy function. */
-int
-pthread_atfork(void (*aPrepare)(void), void (*aParent)(void),
-               void (*aChild)(void))
-{
-  return 0;
-}
-#endif
-
 MOZ_END_EXTERN_C
 
 size_t parseNumber(Buffer aBuf)