Issue #1053 - Remove android support from memory

2 files changed, 1 insertions, 47 deletions

diff --git a/memory/mozalloc/mozalloc.h b/memory/mozalloc/mozalloc.h
index 18752a798..f42c7b04a 100644
--- a/memory/mozalloc/mozalloc.h
+++ b/memory/mozalloc/mozalloc.h
@@ -160,16 +160,7 @@ MFBT_API void* moz_xvalloc(size_t size)
 #  define MOZALLOC_EXPORT_NEW
 #endif
 
-#if defined(ANDROID)
-/*
- * It's important to always specify 'throw()' in GCC because it's used to tell
- * GCC that 'new' may return null. That makes GCC null-check the result before
- * potentially initializing the memory to zero.
- * Also, the Android minimalistic headers don't include std::bad_alloc.
- */
-#define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw()
-#define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
-#elif defined(_MSC_VER)
+#if defined(_MSC_VER)
 /*
  * Suppress build warning spam (bug 578546).
  */
diff --git a/memory/mozalloc/mozalloc_abort.cpp b/memory/mozalloc/mozalloc_abort.cpp
index 85e566db0..40fce125c 100644
--- a/memory/mozalloc/mozalloc_abort.cpp
+++ b/memory/mozalloc/mozalloc_abort.cpp
@@ -7,9 +7,6 @@
 
 #include "mozilla/mozalloc_abort.h"
 
-#ifdef ANDROID
-# include <android/log.h>
-#endif
 #ifdef MOZ_WIDGET_ANDROID
 # include "APKOpen.h"
 # include "dlfcn.h"
@@ -21,40 +18,11 @@
 void
 mozalloc_abort(const char* const msg)
 {
-#ifndef ANDROID
     fputs(msg, stderr);
     fputs("\n", stderr);
-#else
-    __android_log_print(ANDROID_LOG_ERROR, "Gecko", "mozalloc_abort: %s", msg);
-#endif
-#ifdef MOZ_WIDGET_ANDROID
-    abortThroughJava(msg);
-#endif
     MOZ_CRASH();
 }
 
-#ifdef MOZ_WIDGET_ANDROID
-template <size_t N>
-void fillAbortMessage(char (&msg)[N], uintptr_t retAddress) {
-    /*
-     * On Android, we often don't have reliable backtrace when crashing inside
-     * abort(). Therefore, we try to find out who is calling abort() and add
-     * that to the message.
-     */
-    Dl_info info = {};
-    dladdr(reinterpret_cast<void*>(retAddress), &info);
-
-    const char* const module = info.dli_fname ? info.dli_fname : "";
-    const char* const base_module = strrchr(module, '/');
-    const void* const module_offset =
-        reinterpret_cast<void*>(retAddress - uintptr_t(info.dli_fbase));
-    const char* const sym = info.dli_sname ? info.dli_sname : "";
-
-    snprintf(msg, sizeof(msg), "abort() called from %s:%p (%s)",
-             base_module ? base_module + 1 : module, module_offset, sym);
-}
-#endif
-
 #if defined(XP_UNIX) && !defined(MOZ_ASAN)
 // Define abort() here, so that it is used instead of the system abort(). This
 // lets us control the behavior when aborting, in order to get better results
@@ -70,12 +38,7 @@ void fillAbortMessage(char (&msg)[N], uintptr_t retAddress) {
 // result, ASan will just exit(1) instead of aborting.
 extern "C" void abort(void)
 {
-#ifdef MOZ_WIDGET_ANDROID
-    char msg[64] = {};
-    fillAbortMessage(msg, uintptr_t(__builtin_return_address(0)));
-#else
     const char* const msg = "Redirecting call to abort() to mozalloc_abort\n";
-#endif
 
     mozalloc_abort(msg);