Bug 743715 - Cannot build Fennec without jemalloc. r=glandium

memory/mozalloc/mozalloc.cpp

@@ -243,10 +243,8 @@ moz_malloc_usable_size(void *ptr)
 
 #if defined(XP_MACOSX)
     return malloc_size(ptr);
-#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
-    // XXX: the |defined(XP_LINUX)| may be too lax;  some Linux installations
-    // might use a libc that doesn't have malloc_usable_size.  Let's fix this
-    // if/when it happens.
+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
+    // Android bionic libc doesn't have malloc_usable_size.
     return malloc_usable_size(ptr);
 #elif defined(XP_WIN)
     return _msize(ptr);

mozglue/android/nsGeckoUtils.cpp

@@ -36,11 +36,16 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <jni.h>
+
+#ifdef MOZ_MEMORY
 // Wrap malloc and free to use jemalloc
 #define malloc __wrap_malloc
 #define free __wrap_free
+#endif
+
 #include <stdlib.h>
 
+
 extern "C"
 __attribute__ ((visibility("default")))
 void JNICALL