Issue #1053 - Remove Android-specific blocks from system headers and /dom

13 files changed, 9 insertions, 623 deletions

diff --git a/config/system-headers b/config/system-headers
index 76c79c9151..2acb1e3310 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -164,13 +164,6 @@ all.h
 alloca.h
 alloc.h
 alsa/asoundlib.h
-#ifdef ANDROID
-android/ashmem.h
-android/log.h
-android/looper.h
-android/native_window.h
-android_audio/AudioSystem.h
-#endif
 ansi_parms.h
 a.out.h
 app/Cursor.h
@@ -200,14 +193,6 @@ atlimpl.cpp
 atlwin.cpp
 ATSTypes.h
 ATSUnicode.h
-#ifdef ANDROID
-audio_effects/effect_aec.h
-audio_effects/effect_ns.h
-AudioParameter.h
-AudioSystem.h
-AudioTrack.h
-avc_utils.h
-#endif
 Balloons.h
 base/pblock.h
 base/PCR_Base.h
@@ -218,18 +203,6 @@ Beep.h
 be/kernel/image.h
 be/kernel/OS.h
 bfd.h
-#ifdef ANDROID
-binder/Binder.h
-binder/BinderService.h
-binder/IBinder.h
-binder/IInterface.h
-binder/IMemory.h
-binder/IPCThreadState.h
-binder/IPermissionController.h
-binder/IServiceManager.h
-binder/Parcel.h
-binder/ProcessState.h
-#endif
 Bitmap.h
 bitset
 blapi.h
@@ -308,10 +281,6 @@ dfb_types.h
 directfb_strings.h
 directfb_keyboard.h
 callconv.h
-#ifdef ANDROID
-camera/Camera.h
-camera/CameraParameters.h
-#endif
 Carbon/Carbon.h
 CarbonEvents.h
 Carbon.h
@@ -335,9 +304,6 @@ Clipboard.h
 cmplrs/stsupport.h
 Cocoa/Cocoa.h
 CodeFragments.h
-#ifdef ANDROID
-ColorConverter.h
-#endif
 comdef.h
 commctrl.h
 COMMCTRL.H
@@ -366,15 +332,6 @@ ctype.h
 curl/curl.h
 curl/easy.h
 curses.h
-#ifdef ANDROID
-cutils/android_reboot.h
-cutils/atomic.h
-cutils/compiler.h
-cutils/log.h
-cutils/native_handle.h
-cutils/properties.h
-cutils/sockets.h
-#endif
 cxxabi.h
 DateTimeUtils.h
 dbus/dbus.h
@@ -429,19 +386,6 @@ fontconfig/fontconfig.h
 fontconfig/fcfreetype.h
 Font.h
 Fonts.h
-#ifdef ANDROID
-foundation/ABase.h
-foundation/ABitReader.h
-foundation/ABuffer.h
-foundation/ADebug.h
-foundation/AHandler.h
-foundation/AHandlerReflector.h
-foundation/ALooper.h
-foundation/AMessage.h
-foundation/AString.h
-foundation/base64.h
-foundation/hexdump.h
-#endif
 fp.h
 fpieee.h
 frame/log.h
@@ -505,33 +449,8 @@ gssapi.h
 gtk/gtk.h
 gtk/gtkx.h
 gtk/gtkunixprint.h
-#ifdef ANDROID
-gui/BufferQueue.h
-gui/ConsumerBase.h
-gui/GraphicBufferAlloc.h
-gui/IConsumerListener.h
-gui/IGraphicBufferAlloc.h
-gui/IGraphicBufferProducer.h
-gui/ISurfaceComposer.h
-gui/ISurfaceComposerClient.h
-gui/ISurfaceTexture.h
-gui/Surface.h
-gui/SurfaceComposerClient.h
-gui/SurfaceTextureClient.h
-hardware/audio.h
-hardware/gralloc.h
-hardware/hardware.h
-hardware/hwcomposer.h
-hardware/lights.h
-hardware/power.h
-hardware_legacy/power.h
-hardware_legacy/uevent.h
-#endif
 HIToolbox/HIToolbox.h
 hlink.h
-#ifdef ANDROID
-HTTPBase.h
-#endif
 ia64/sys/inline.h
 Icons.h
 iconv.h
@@ -623,10 +542,6 @@ libgnomeui/gnome-icon-theme.h
 libgnomeui/gnome-ui-init.h
 limits.h
 link.h
-#ifdef ANDROID
-linux/android_alarm.h
-linux/ashmem.h
-#endif
 linux/ioprio.h
 linux/kernel.h
 linux/limits.h
@@ -712,53 +627,6 @@ mapix.h
 Math64.h
 math.h
 mbstring.h
-#ifdef ANDROID
-android/native_window.h
-android/native_window_jni.h
-media/AudioEffect.h
-media/AudioSystem.h
-media/ICrypto.h
-media/IOMX.h
-media/MediaProfiles.h
-media/MediaRecorderBase.h
-media/openmax/OMX_Audio.h
-media/stagefright/AACWriter.h
-media/stagefright/AMRWriter.h
-media/stagefright/AudioSource.h
-media/stagefright/DataSource.h
-media/stagefright/foundation/ABase.h
-media/stagefright/foundation/ABitReader.h
-media/stagefright/foundation/ABuffer.h
-media/stagefright/foundation/ADebug.h
-media/stagefright/foundation/AHandler.h
-media/stagefright/foundation/AHandlerReflector.h
-media/stagefright/foundation/ALooper.h
-media/stagefright/foundation/AMessage.h
-media/stagefright/foundation/AString.h
-media/stagefright/foundation/base64.h
-media/stagefright/foundation/hexdump.h
-media/stagefright/MediaBuffer.h
-media/stagefright/MediaBufferGroup.h
-media/stagefright/MediaCodec.h
-media/stagefright/MediaCodecList.h
-media/stagefright/MediaCodecSource.h
-media/stagefright/MediaDefs.h
-media/stagefright/MediaErrors.h
-media/stagefright/MediaExtractor.h
-media/stagefright/MediaSource.h
-media/stagefright/MediaWriter.h
-media/stagefright/MetaData.h
-media/stagefright/MPEG2TSWriter.h
-media/stagefright/MPEG4Writer.h
-media/stagefright/OMXClient.h
-media/stagefright/OMXCodec.h
-media/stagefright/openmax/OMX_Core.h
-media/stagefright/openmax/OMX_Index.h
-media/stagefright/openmax/OMX_IVCommon.h
-media/stagefright/openmax/OMX_Types.h
-media/stagefright/openmax/OMX_Video.h
-media/stagefright/Utils.h
-#endif
 mem.h
 memory.h
 Memory.h
@@ -798,10 +666,6 @@ Objsafe.h
 ojiapitests.h
 ole2.h
 oleidl.h
-#ifdef ANDROID
-OMX.h
-OMX_Component.h
-#endif
 OpenGL/OpenGL.h
 OpenTptInternet.h
 OpenTransport.h
@@ -847,10 +711,6 @@ PP_Resources.h
 PP_Types.h
 Printing.h
 Print/PMPrintingDialogExtensions.h
-#ifdef ANDROID
-private/android_filesystem_config.h
-private/qucomextra_p.h
-#endif
 Processes.h
 process.h
 Process.h
@@ -917,43 +777,6 @@ Sound.h
 soundcard.h
 sqlite3.h
 sstream
-#ifdef ANDROID
-stagefright/AACWriter.h
-stagefright/AMRWriter.h
-stagefright/AudioSource.h
-stagefright/DataSource.h
-stagefright/foundation/ABase.h
-stagefright/foundation/ABitReader.h
-stagefright/foundation/ABuffer.h
-stagefright/foundation/ADebug.h
-stagefright/foundation/AHandler.h
-stagefright/foundation/AHandlerReflector.h
-stagefright/foundation/ALooper.h
-stagefright/foundation/AMessage.h
-stagefright/foundation/AString.h
-stagefright/foundation/base64.h
-stagefright/foundation/hexdump.h
-stagefright/MediaBuffer.h
-stagefright/MediaBufferGroup.h
-stagefright/MediaCodec.h
-stagefright/MediaDefs.h
-stagefright/MediaErrors.h
-stagefright/MediaExtractor.h
-stagefright/MediaSource.h
-stagefright/MediaWriter.h
-stagefright/MetaData.h
-stagefright/MPEG2TSWriter.h
-stagefright/MPEG4Writer.h
-stagefright/OMXCodec.h
-stagefright/OMXClient.h
-stagefright/openmax/OMX_Component.h
-stagefright/openmax/OMX_Core.h
-stagefright/openmax/OMX_Index.h
-stagefright/openmax/OMX_IVCommon.h
-stagefright/openmax/OMX_Types.h
-stagefright/openmax/OMX_Video.h
-stagefright/Utils.h
-#endif
 StandardFile.h
 starlet.h
 stat.h
@@ -981,9 +804,6 @@ SupportDefs.h
 support/String.h
 support/SupportDefs.h
 support/TLS.h
-#ifdef ANDROID
-suspend/autosuspend.h
-#endif
 svrcore.h
 symconst.h
 sym.h
@@ -1071,12 +891,6 @@ sys/unistd.h
 sys/utsname.h
 sys/vfs.h
 sys/wait.h
-#ifdef ANDROID
-sysutils/NetlinkEvent.h
-system/audio.h
-system/graphics.h
-system/window.h
-#endif
 tables.h
 TArray.h
 TArrayIterator.h
@@ -1119,15 +933,6 @@ UEventMgr.h
 UException.h
 UExtractFromAEDesc.h
 UGWorld.h
-#ifdef ANDROID
-ui/ANativeObjectBase.h
-ui/egl/android_natives.h
-ui/Fence.h
-ui/FramebufferNativeWindow.h
-ui/GraphicBuffer.h
-ui/Rect.h
-ui/Region.h
-#endif
 UKeyFilters.h
 ulocks.h
 ulserrno.h
@@ -1149,28 +954,6 @@ UReanimator.h
 URegions.h
 URegistrar.h
 UResourceMgr.h
-#ifdef ANDROID
-utils/BitSet.h
-utils/CallStack.h
-utils/Errors.h
-utils/FileMap.h
-utils/KeyedVector.h
-utils/List.h
-utils/Log.h
-utils/Looper.h
-utils/PropertyMap.h
-utils/RefBase.h
-utils/String16.h
-utils/String8.h
-utils/threads.h
-utils/TextOutput.h
-utils/Timers.h
-utils/Trace.h
-utils/TypeHelpers.h
-utils/Unicode.h
-utils/Vector.h
-utils/VectorImpl.h
-#endif
 urlhist.h
 urlmon.h
 UScrap.h
diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp
index 4ceada5e15..88ec9c911f 100644
--- a/dom/base/nsFrameMessageManager.cpp
+++ b/dom/base/nsFrameMessageManager.cpp
@@ -49,9 +49,6 @@
 #include <algorithm>
 #include "chrome/common/ipc_channel.h" // for IPC::Channel::kMaximumMessageSize
 
-#ifdef ANDROID
-#include <android/log.h>
-#endif
 #ifdef XP_WIN
 #include <windows.h>
 # if defined(SendMessage)
@@ -896,9 +893,6 @@ nsFrameMessageManager::GetChildAt(uint32_t aIndex,
 NS_IMETHODIMP
 nsFrameMessageManager::Dump(const nsAString& aStr)
 {
-#ifdef ANDROID
-  __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", NS_ConvertUTF16toUTF8(aStr).get());
-#endif
 #ifdef XP_WIN
   if (IsDebuggerPresent()) {
     OutputDebugStringW(PromiseFlatString(aStr).get());
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 38a58f947a..a09847820b 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -24,9 +24,6 @@
 #include "mozilla/dom/Timeout.h"
 #include "mozilla/dom/TimeoutHandler.h"
 #include "mozilla/IntegerPrintfMacros.h"
-#if defined(MOZ_WIDGET_ANDROID)
-#include "mozilla/dom/WindowOrientationObserver.h"
-#endif
 #include "nsDOMOfflineResourceList.h"
 #include "nsError.h"
 #include "nsIIdleService.h"
@@ -251,10 +248,6 @@ class nsIScriptTimeoutHandler;
 #endif // check
 #include "AccessCheck.h"
 
-#ifdef ANDROID
-#include <android/log.h>
-#endif
-
 #ifdef XP_WIN
 #include <process.h>
 #define getpid _getpid
@@ -1917,10 +1910,6 @@ nsGlobalWindow::CleanUp()
   mSpeechSynthesis = nullptr;
 #endif
 
-#if defined(MOZ_WIDGET_ANDROID)
-  mOrientationChangeObserver = nullptr;
-#endif
-
   ClearControllers();
 
   mOpener = nullptr;             // Forces Release
@@ -2041,10 +2030,6 @@ nsGlobalWindow::FreeInnerObjects(bool aForDocumentOpen)
     mScreen = nullptr;
   }
 
-#if defined(MOZ_WIDGET_ANDROID)
-  mOrientationChangeObserver = nullptr;
-#endif
-
   if (mDoc) {
     // Remember the document's principal and URI.
     mDocumentPrincipal = mDoc->NodePrincipal();
@@ -7133,9 +7118,6 @@ nsGlobalWindow::Dump(const nsAString& aStr)
 #ifdef XP_WIN
     PrintToDebugger(cstr);
 #endif
-#ifdef ANDROID
-    __android_log_write(ANDROID_LOG_INFO, "GeckoDump", cstr);
-#endif
     FILE *fp = gDumpFile ? gDumpFile : stdout;
     fputs(cstr, fp);
     fflush(fp);
@@ -13764,27 +13746,6 @@ nsGlobalWindow::DisableDeviceSensor(uint32_t aType)
   }
 }
 
-#if defined(MOZ_WIDGET_ANDROID)
-void
-nsGlobalWindow::EnableOrientationChangeListener()
-{
-  MOZ_ASSERT(IsInnerWindow());
-  if (!nsContentUtils::ShouldResistFingerprinting(mDocShell) &&
-      !mOrientationChangeObserver) {
-    mOrientationChangeObserver =
-      new WindowOrientationObserver(this);
-  }
-}
-
-void
-nsGlobalWindow::DisableOrientationChangeListener()
-{
-  MOZ_ASSERT(IsInnerWindow());
-
-  mOrientationChangeObserver = nullptr;
-}
-#endif
-
 void
 nsGlobalWindow::SetHasGamepadEventListener(bool aHasGamepad/* = true*/)
 {
@@ -14471,15 +14432,6 @@ nsGlobalWindow::InitWasOffline()
   mWasOffline = NS_IsOffline();
 }
 
-#if defined(MOZ_WIDGET_ANDROID)
-int16_t
-nsGlobalWindow::Orientation(CallerType aCallerType) const
-{
-  return nsContentUtils::ResistFingerprinting(aCallerType) ?
-           0 : WindowOrientationObserver::OrientationAngle();
-}
-#endif
-
 Console*
 nsGlobalWindow::GetConsole(ErrorResult& aRv)
 {
diff --git a/dom/canvas/WebGLContextGL.cpp b/dom/canvas/WebGLContextGL.cpp
index e58fcd0d8f..d01a0d44e3 100644
--- a/dom/canvas/WebGLContextGL.cpp
+++ b/dom/canvas/WebGLContextGL.cpp
@@ -145,9 +145,6 @@ WebGLContext::BindFramebuffer(GLenum target, WebGLFramebuffer* wfb)
     } else {
         GLuint framebuffername = wfb->mGLName;
         gl->fBindFramebuffer(target, framebuffername);
-#ifdef ANDROID
-        wfb->mIsFB = true;
-#endif
     }
 
     switch (target) {
@@ -982,14 +979,6 @@ WebGLContext::IsFramebuffer(const WebGLFramebuffer* fb)
     if (!ValidateIsObject("isFramebuffer", fb))
         return false;
 
-#ifdef ANDROID
-    if (gl->WorkAroundDriverBugs() &&
-        gl->Renderer() == GLRenderer::AndroidEmulator)
-    {
-        return fb->mIsFB;
-    }
-#endif
-
     MakeContextCurrent();
     return gl->fIsFramebuffer(fb->mGLName);
 }
diff --git a/dom/canvas/WebGLFramebuffer.cpp b/dom/canvas/WebGLFramebuffer.cpp
index 0abaf3dd79..7a1d4dbd9e 100644
--- a/dom/canvas/WebGLFramebuffer.cpp
+++ b/dom/canvas/WebGLFramebuffer.cpp
@@ -621,9 +621,6 @@ WebGLFBAttachPoint::GetParameter(const char* funcName, WebGLContext* webgl, JSCo
 WebGLFramebuffer::WebGLFramebuffer(WebGLContext* webgl, GLuint fbo)
     : WebGLRefCountedObject(webgl)
     , mGLName(fbo)
-#ifdef ANDROID
-    , mIsFB(false)
-#endif
     , mDepthAttachment(this, LOCAL_GL_DEPTH_ATTACHMENT)
     , mStencilAttachment(this, LOCAL_GL_STENCIL_ATTACHMENT)
     , mDepthStencilAttachment(this, LOCAL_GL_DEPTH_STENCIL_ATTACHMENT)
@@ -657,10 +654,6 @@ WebGLFramebuffer::Delete()
     mContext->gl->fDeleteFramebuffers(1, &mGLName);
 
     LinkedListElement<WebGLFramebuffer>::removeFrom(mContext->mFramebuffers);
-
-#ifdef ANDROID
-    mIsFB = false;
-#endif
 }
 
 ////
diff --git a/dom/canvas/WebGLFramebuffer.h b/dom/canvas/WebGLFramebuffer.h
index 53e01dfe76..133bf3d090 100644
--- a/dom/canvas/WebGLFramebuffer.h
+++ b/dom/canvas/WebGLFramebuffer.h
@@ -155,17 +155,6 @@ public:
     const GLuint mGLName;
 
 protected:
-#ifdef ANDROID
-    // Bug 1140459: Some drivers (including our test slaves!) don't
-    // give reasonable answers for IsRenderbuffer, maybe others.
-    // This shows up on Android 2.3 emulator.
-    //
-    // So we track the `is a Framebuffer` state ourselves.
-    bool mIsFB;
-#endif
-
-    ////
-
     WebGLFBAttachPoint mDepthAttachment;
     WebGLFBAttachPoint mStencilAttachment;
     WebGLFBAttachPoint mDepthStencilAttachment;
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 089bde8bb2..410d93de27 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -10,7 +10,7 @@
 #include "ContentParent.h"
 #include "TabParent.h"
 
-#if defined(ANDROID) || defined(LINUX)
+#if defined(LINUX)
 # include <sys/time.h>
 # include <sys/resource.h>
 #endif
@@ -177,7 +177,7 @@
 #include "signaling/src/peerconnection/WebrtcGlobalParent.h"
 #endif
 
-#if defined(ANDROID) || defined(LINUX)
+#if defined(LINUX)
 #include "nsSystemInfo.h"
 #endif
 
@@ -185,18 +185,10 @@
 #include "mozilla/Hal.h"
 #endif
 
-#ifdef ANDROID
-# include "gfxAndroidPlatform.h"
-#endif
-
 #ifdef MOZ_PERMISSIONS
 # include "nsPermissionManager.h"
 #endif
 
-#ifdef MOZ_WIDGET_ANDROID
-# include "AndroidBridge.h"
-#endif
-
 #ifdef MOZ_WIDGET_GTK
 #include <gdk/gdk.h>
 #endif
@@ -1510,7 +1502,7 @@ ContentParent::OnChannelConnected(int32_t pid)
 {
   SetOtherProcessId(pid);
 
-#if defined(ANDROID) || defined(LINUX)
+#if defined(LINUX)
   // Check nice preference
   int32_t nice = Preferences::GetInt("dom.ipc.content.nice", 0);
 
@@ -2211,9 +2203,6 @@ ContentParent::OnVarChanged(const GfxVarUpdate& aVar)
 bool
 ContentParent::RecvReadFontList(InfallibleTArray<FontListEntry>* retValue)
 {
-#ifdef ANDROID
-  gfxAndroidPlatform::GetPlatform()->GetSystemFontList(retValue);
-#endif
   return true;
 }
 
@@ -2371,19 +2360,6 @@ bool
 ContentParent::RecvGetSystemColors(const uint32_t& colorsCount,
                                    InfallibleTArray<uint32_t>* colors)
 {
-#ifdef MOZ_WIDGET_ANDROID
-  NS_ASSERTION(AndroidBridge::Bridge() != nullptr, "AndroidBridge is not available");
-  if (AndroidBridge::Bridge() == nullptr) {
-    // Do not fail - the colors won't be right, but it's not critical
-    return true;
-  }
-
-  colors->AppendElements(colorsCount);
-
-  // The array elements correspond to the members of AndroidSystemColors structure,
-  // so just pass the pointer to the elements buffer
-  AndroidBridge::Bridge()->GetSystemColors((AndroidSystemColors*)colors->Elements());
-#endif
   return true;
 }
 
@@ -2392,17 +2368,6 @@ ContentParent::RecvGetIconForExtension(const nsCString& aFileExt,
                                        const uint32_t& aIconSize,
                                        InfallibleTArray<uint8_t>* bits)
 {
-#ifdef MOZ_WIDGET_ANDROID
-  NS_ASSERTION(AndroidBridge::Bridge() != nullptr, "AndroidBridge is not available");
-  if (AndroidBridge::Bridge() == nullptr) {
-    // Do not fail - just no icon will be shown
-    return true;
-  }
-
-  bits->AppendElements(aIconSize * aIconSize * 4);
-
-  AndroidBridge::Bridge()->GetIconForExtension(aFileExt, aIconSize, bits->Elements());
-#endif
   return true;
 }
 
@@ -2411,11 +2376,6 @@ ContentParent::RecvGetShowPasswordSetting(bool* showPassword)
 {
   // default behavior is to show the last password character
   *showPassword = true;
-#ifdef MOZ_WIDGET_ANDROID
-  NS_ASSERTION(AndroidBridge::Bridge() != nullptr, "AndroidBridge is not available");
-
-  *showPassword = java::GeckoAppShell::GetShowPasswordSetting();
-#endif
   return true;
 }
 
@@ -4460,13 +4420,8 @@ ContentParent::RecvEndDriverCrashGuard(const uint32_t& aGuardType)
 bool
 ContentParent::RecvGetAndroidSystemInfo(AndroidSystemInfo* aInfo)
 {
-#ifdef MOZ_WIDGET_ANDROID
-  nsSystemInfo::GetAndroidSystemInfo(aInfo);
-  return true;
-#else
   MOZ_CRASH("wrong platform!");
   return false;
-#endif
 }
 
 bool
diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index 37c692a4bc..fe40c82e24 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -21,16 +21,11 @@
 extern mozilla::LazyLogModule gMediaStreamGraphLog;
 #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
-// We don't use NSPR log here because we want this interleaved with adb logcat
-// on Android/B2G
+// XXX: We didn't use NSPR log here because we wanted this interleaved with
+// adb logcat on Android/B2G. This is no longer a concern; use NSPR?
 // #define ENABLE_LIFECYCLE_LOG
 #ifdef ENABLE_LIFECYCLE_LOG
-#ifdef ANDROID
-#include "android/log.h"
-#define LIFECYCLE_LOG(...)  __android_log_print(ANDROID_LOG_INFO, "Gecko - MSG" , __VA_ARGS__); printf(__VA_ARGS__);printf("\n");
-#else
 #define LIFECYCLE_LOG(...) printf(__VA_ARGS__);printf("\n");
-#endif
 #else
 #define LIFECYCLE_LOG(...)
 #endif
diff --git a/dom/power/PowerManagerService.cpp b/dom/power/PowerManagerService.cpp
index 057d5c992b..bc2f40c40a 100644
--- a/dom/power/PowerManagerService.cpp
+++ b/dom/power/PowerManagerService.cpp
@@ -23,23 +23,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef ANDROID
-#include <android/log.h>
-extern "C" char* PrintJSStack();
-static void LogFunctionAndJSStack(const char* funcname) {
-  char *jsstack = PrintJSStack();
-  __android_log_print(ANDROID_LOG_INFO, "PowerManagerService", \
-                      "Call to %s. The JS stack is:\n%s\n",
-                      funcname,
-                      jsstack ? jsstack : "<no JS stack>");
-  JS_smprintf_free(jsstack);
-}
-// bug 839452
-#define LOG_FUNCTION_AND_JS_STACK() \
-  LogFunctionAndJSStack(__PRETTY_FUNCTION__);
-#else
 #define LOG_FUNCTION_AND_JS_STACK()
-#endif
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index 1f8b3b70c4..f33ded1c5f 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -91,10 +91,6 @@
 #include "prthread.h"
 #include "xpcpublic.h"
 
-#ifdef ANDROID
-#include <android/log.h>
-#endif
-
 #ifdef DEBUG
 #include "nsThreadManager.h"
 #endif
@@ -334,11 +330,6 @@ LogErrorToConsole(const WorkerErrorReport& aReport, uint64_t aInnerWindowId)
 
   static const char kErrorString[] = "JS error in Web Worker: %s [%s:%u]";
 
-#ifdef ANDROID
-  __android_log_print(ANDROID_LOG_INFO, "Gecko", kErrorString, msg.get(),
-                      filename.get(), aReport.mLineNumber);
-#endif
-
   fprintf(stderr, kErrorString, msg.get(), filename.get(), aReport.mLineNumber);
   fflush(stderr);
 }
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
index 195df5c9eb..081f0f1065 100644
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -33,10 +33,6 @@
 #include "nsIServiceWorkerManager.h"
 #include "nsIScriptTimeoutHandler.h"
 
-#ifdef ANDROID
-#include <android/log.h>
-#endif
-
 #include "Crypto.h"
 #include "Principal.h"
 #include "RuntimeService.h"
@@ -378,9 +374,6 @@ WorkerGlobalScope::Dump(const Optional<nsAString>& aString) const
   NS_ConvertUTF16toUTF8 str(aString.Value());
 
   MOZ_LOG(nsContentUtils::DOMDumpLog(), LogLevel::Debug, ("[Worker.Dump] %s", str.get()));
-#ifdef ANDROID
-  __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", str.get());
-#endif
   fputs(str.get(), stdout);
   fflush(stdout);
 }
diff --git a/dom/worklet/WorkletGlobalScope.cpp b/dom/worklet/WorkletGlobalScope.cpp
index be3e975ac6..87bca208a0 100644
--- a/dom/worklet/WorkletGlobalScope.cpp
+++ b/dom/worklet/WorkletGlobalScope.cpp
@@ -92,10 +92,6 @@ WorkletGlobalScope::Dump(const Optional<nsAString>& aString) const
 
   NS_ConvertUTF16toUTF8 str(aString.Value());
 
-#ifdef ANDROID
-  __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", str.get());
-#endif
-
   fputs(str.get(), stdout);
   fflush(stdout);
 }
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 70488a4722..ce2c9c770a 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -530,13 +530,6 @@ pref("media.navigator.audio.full_duplex", false);
 pref("media.peerconnection.capture_delay", 50);
 pref("media.getusermedia.playout_delay", 40);
 pref("media.navigator.audio.full_duplex", false);
-#elif defined(ANDROID)
-pref("media.peerconnection.capture_delay", 100);
-pref("media.getusermedia.playout_delay", 100);
-pref("media.navigator.audio.full_duplex", false);
-// Whether to enable Webrtc Hardware acceleration support
-pref("media.navigator.hardware.vp8_encode.acceleration_enabled", false);
-pref("media.navigator.hardware.vp8_decode.acceleration_enabled", false);
 #elif defined(XP_LINUX)
 pref("media.peerconnection.capture_delay", 70);
 pref("media.getusermedia.playout_delay", 50);
@@ -551,9 +544,7 @@ pref("media.navigator.audio.full_duplex", false);
 
 pref("dom.webaudio.enabled", true);
 
-#if !defined(ANDROID)
 pref("media.getusermedia.screensharing.enabled", true);
-#endif
 
 pref("media.getusermedia.screensharing.allowed_domains", "webex.com,*.webex.com,ciscospark.com,*.ciscospark.com,projectsquared.com,*.projectsquared.com,*.room.co,room.co,beta.talky.io,talky.io,*.clearslide.com,appear.in,*.appear.in,tokbox.com,*.tokbox.com,*.sso.francetelecom.fr,*.si.francetelecom.fr,*.sso.infra.ftgroup,*.multimedia-conference.orange-business.com,*.espacecollaboration.orange-business.com,free.gotomeeting.com,g2m.me,*.g2m.me,*.mypurecloud.com,*.mypurecloud.com.au,spreed.me,*.spreed.me,*.spreed.com,air.mozilla.org,*.circuit.com,*.yourcircuit.com,circuit.siemens.com,yourcircuit.siemens.com,circuitsandbox.net,*.unify.com,tandi.circuitsandbox.net,*.ericsson.net,*.cct.ericsson.net,*.opentok.com,*.conf.meetecho.com,meet.jit.si,*.meet.jit.si,web.stage.speakeasyapp.net,web.speakeasyapp.net,*.hipchat.me,*.beta-wspbx.com,*.wspbx.com,*.unifiedcloudit.com,*.smartboxuc.com,*.smartbox-uc.com,*.panterranetworks.com,pexipdemo.com,*.pexipdemo.com,pex.me,*.pex.me,*.rd.pexip.com,1click.io,*.1click.io,*.fuze.com,*.fuzemeeting.com,*.thinkingphones.com,gotomeeting.com,*.gotomeeting.com,gotowebinar.com,*.gotowebinar.com,gototraining.com,*.gototraining.com,citrix.com,*.citrix.com,expertcity.com,*.expertcity.com,citrixonline.com,*.citrixonline.com,g2m.me,*.g2m.me,gotomeet.me,*.gotomeet.me,gotomeet.at,*.gotomeet.at,miriadaxdes.miriadax.net,certificacion.miriadax.net,miriadax.net,*.wire.com,sylaps.com,*.sylaps.com,bluejeans.com,*.bluejeans.com,*.a.bluejeans.com,*.bbcollab.com");
 // OS/X 10.6 has screen/window sharing off by default due to various issues - Caveat emptor
@@ -572,7 +563,7 @@ pref("media.mediasource.enabled", true);
 
 pref("media.mediasource.mp4.enabled", true);
 
-#if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID)
+#if defined(XP_WIN) || defined(XP_MACOSX)
 pref("media.mediasource.webm.enabled", false);
 #else
 pref("media.mediasource.webm.enabled", true);
@@ -696,15 +687,7 @@ pref("apz.y_stationary_size_multiplier", "3.5");
 pref("apz.zoom_animation_duration_ms", 250);
 pref("apz.scale_repaint_delay_ms", 500);
 
-#if defined(MOZ_WIDGET_ANDROID)
-// Mobile prefs
-pref("apz.allow_zooming", true);
-pref("apz.enlarge_displayport_when_clipped", true);
-pref("apz.y_skate_size_multiplier", "1.5");
-pref("apz.y_stationary_size_multiplier", "1.5");
-#endif
-
-#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_UIKIT)
+#if !defined(MOZ_WIDGET_UIKIT)
 pref("apz.desktop.enabled", false);
 #endif
 
@@ -716,10 +699,8 @@ pref("apz.desktop.enabled", false);
 pref("gfx.hidpi.enabled", 2);
 #endif
 
-#if !defined(MOZ_WIDGET_ANDROID)
-// Use containerless scrolling for now on desktop.
+// Use containerless scrolling for now.
 pref("layout.scroll.root-frame-containers", false);
-#endif
 
 // Whether to enable LayerScope tool and default listening port
 pref("gfx.layerscope.enabled", false);
@@ -753,11 +734,6 @@ pref("gfx.downloadable_fonts.disable_cache", false);
 
 pref("gfx.downloadable_fonts.woff2.enabled", true);
 
-#ifdef ANDROID
-pref("gfx.bundled_fonts.enabled", true);
-pref("gfx.bundled_fonts.force-enabled", false);
-#endif
-
 // Do we fire a notification about missing fonts, so the front-end can decide
 // whether to try and do something about it (e.g. download additional fonts)?
 pref("gfx.missing_fonts.notify", false);
@@ -2032,9 +2008,6 @@ pref("network.proxy.no_proxies_on",         "localhost, 127.0.0.1");
 pref("network.proxy.failover_timeout",      1800); // 30 minutes
 pref("network.online",                      true); //online/offline
 pref("network.cookie.cookieBehavior",       0); // 0-Accept, 1-dontAcceptForeign, 2-dontAcceptAny, 3-limitForeign
-#ifdef ANDROID
-pref("network.cookie.cookieBehavior",       0); // Keep the old default of accepting all cookies
-#endif
 pref("network.cookie.thirdparty.sessionOnly", false);
 pref("network.cookie.leave-secure-alone",   true);
 pref("network.cookie.lifetimePolicy",       0); // 0-accept, 1-dontUse 2-acceptForSession, 3-acceptForNDays
@@ -2079,12 +2052,8 @@ pref("intl.locale.matchOS",                 false);
 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
 pref("font.language.group",                 "chrome://global/locale/intl.properties");
 
-// Android-specific pref to use key-events-only mode for IME-unaware webapps.
-#ifdef MOZ_WIDGET_ANDROID
-pref("intl.ime.hack.on_ime_unaware_apps.fire_key_events_for_composition", true);
-#else
+// Pref to use key-events-only mode for IME-unaware webapps. (legacy from android)
 pref("intl.ime.hack.on_ime_unaware_apps.fire_key_events_for_composition", false);
-#endif
 
 // If you use legacy Chinese IME which puts an ideographic space to composition
 // string as placeholder, this pref might be useful.  If this is true and when
@@ -3912,68 +3881,6 @@ pref("mousewheel.enable_pixel_scrolling", true);
 # XP_MACOSX
 #endif
 
-#ifdef ANDROID
-// Handled differently under Mac/Windows
-pref("network.protocol-handler.warn-external.file", false);
-pref("browser.drag_out_of_frame_style", 1);
-
-// Middle-mouse handling
-pref("middlemouse.paste", true);
-pref("middlemouse.contentLoadURL", true);
-pref("middlemouse.openNewWindow", true);
-pref("middlemouse.scrollbarPosition", true);
-
-pref("browser.urlbar.clickSelectsAll", false);
-
-// Tab focus model bit field:
-// 1 focuses text controls, 2 focuses other form elements, 4 adds links.
-// Leave this at the default, 7, to match mozilla1.0-era user expectations.
-// pref("accessibility.tabfocus", 1);
-
-// autocomplete keyboard grab workaround
-pref("autocomplete.grab_during_popup", true);
-pref("autocomplete.ungrab_during_mode_switch", true);
-
-// Default to using the system filepicker if possible, but allow
-// toggling to use the XUL filepicker
-pref("ui.allow_platform_file_picker", true);
-
-pref("helpers.global_mime_types_file", "/etc/mime.types");
-pref("helpers.global_mailcap_file", "/etc/mailcap");
-pref("helpers.private_mime_types_file", "~/.mime.types");
-pref("helpers.private_mailcap_file", "~/.mailcap");
-pref("print.printer_list", ""); // list of printers, separated by spaces
-pref("print.print_reversed", false);
-pref("print.print_color", true);
-pref("print.print_landscape", false);
-pref("print.print_paper_size", 0);
-
-// print_extra_margin enables platforms to specify an extra gap or margin
-// around the content of the page for Print Preview only
-pref("print.print_extra_margin", 0); // twips
-
-/* PostScript print module prefs */
-// pref("print.postscript.enabled",      true);
-
-// Setting default_level_parent to true makes the default level for popup
-// windows "top" instead of "parent".  On GTK2 platform, this is implemented
-// with override-redirect windows which is the normal way to implement
-// temporary popup windows.  Setting this to false would make the default
-// level "parent" which is implemented with managed windows.
-// A problem with using managed windows is that metacity sometimes deactivates
-// the parent window when the managed popup is shown.
-pref("ui.panel.default_level_parent", true);
-
-pref("mousewheel.system_scroll_override_on_root_content.enabled", false);
-
-// Forward downloads with known OMA MIME types to Android's download manager
-// instead of downloading them in the browser.
-pref("browser.download.forward_oma_android_download_manager", false);
-
-# ANDROID
-#endif
-
-#ifndef ANDROID
 #ifndef XP_MACOSX
 #ifdef XP_UNIX
 // Handled differently under Mac/Windows
@@ -4185,113 +4092,7 @@ pref("gfx.font_rendering.fontconfig.max_generic_substitutions", 3);
 # XP_UNIX
 #endif
 #endif
-#endif
-
-#if defined(ANDROID)
-
-pref("font.size.fixed.ar", 12);
-
-pref("font.default.el", "sans-serif");
-pref("font.size.fixed.el", 12);
-
-pref("font.size.fixed.he", 12);
-
-pref("font.default.x-cyrillic", "sans-serif");
-pref("font.size.fixed.x-cyrillic", 12);
-
-pref("font.default.x-unicode", "sans-serif");
-pref("font.size.fixed.x-unicode", 12);
-
-pref("font.default.x-western", "sans-serif");
-pref("font.size.fixed.x-western", 12);
-
-# ANDROID
-#endif
 
-#if defined(ANDROID)
-// We use the bundled fonts for Firefox for Android
-
-pref("font.name-list.emoji", "Noto Color Emoji");
-
-// ar
-
-pref("font.name.serif.el", "Droid Serif"); // not Charis SIL Compact, only has a few Greek chars
-pref("font.name.sans-serif.el", "Clear Sans");
-pref("font.name.monospace.el", "Droid Sans Mono");
-pref("font.name-list.serif.el", "Noto Serif");
-pref("font.name-list.sans-serif.el", "Clear Sans, Roboto, Droid Sans");
-
-pref("font.name.serif.he", "Droid Serif");
-pref("font.name.sans-serif.he", "Clear Sans");
-pref("font.name.monospace.he", "Droid Sans Mono");
-pref("font.name-list.serif.he", "Noto Serif");
-pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Clear Sans, Droid Sans");
-
-pref("font.name.serif.ja", "Charis SIL Compact");
-pref("font.name.sans-serif.ja", "Clear Sans");
-pref("font.name.monospace.ja", "MotoyaLMaru");
-pref("font.name-list.serif.ja", "Noto Serif, Droid Serif");
-pref("font.name-list.sans-serif.ja", "Clear Sans, Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Noto Sans JP, Noto Sans CJK JP, Droid Sans Japanese");
-pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono CJK JP, Droid Sans Mono");
-
-pref("font.name.serif.ko", "Charis SIL Compact");
-pref("font.name.sans-serif.ko", "Clear Sans");
-pref("font.name.monospace.ko", "Droid Sans Mono");
-pref("font.name-list.serif.ko", "Noto Serif, Droid Serif, HYSerif");
-pref("font.name-list.sans-serif.ko", "SmartGothic, NanumGothic, Noto Sans KR, Noto Sans CJK KR, DroidSansFallback, Droid Sans Fallback");
-pref("font.name-list.monospace.ko", "Noto Sans Mono CJK KR");
-
-pref("font.name.serif.th", "Charis SIL Compact");
-pref("font.name.sans-serif.th", "Clear Sans");
-pref("font.name.monospace.th", "Droid Sans Mono");
-pref("font.name-list.serif.th", "Noto Serif, Droid Serif");
-pref("font.name-list.sans-serif.th", "Droid Sans Thai, Clear Sans, Droid Sans");
-
-pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
-pref("font.name.sans-serif.x-cyrillic", "Clear Sans");
-pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
-pref("font.name-list.serif.x-cyrillic", "Noto Serif, Droid Serif");
-pref("font.name-list.sans-serif.x-cyrillic", "Clear Sans, Roboto, Droid Sans");
-
-pref("font.name.serif.x-unicode", "Charis SIL Compact");
-pref("font.name.sans-serif.x-unicode", "Clear Sans");
-pref("font.name.monospace.x-unicode", "Droid Sans Mono");
-pref("font.name-list.serif.x-unicode", "Noto Serif, Droid Serif");
-pref("font.name-list.sans-serif.x-unicode", "Clear Sans, Roboto, Droid Sans");
-
-pref("font.name.serif.x-western", "Charis SIL Compact");
-pref("font.name.sans-serif.x-western", "Clear Sans");
-pref("font.name.monospace.x-western", "Droid Sans Mono");
-pref("font.name-list.serif.x-western", "Noto Serif, Droid Serif");
-pref("font.name-list.sans-serif.x-western", "Clear Sans, Roboto, Droid Sans");
-
-pref("font.name.serif.zh-CN", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-CN", "Clear Sans");
-pref("font.name.monospace.zh-CN", "Droid Sans Mono");
-pref("font.name-list.serif.zh-CN", "Noto Serif, Droid Serif, Droid Sans Fallback");
-pref("font.name-list.sans-serif.zh-CN", "Roboto, Droid Sans, Noto Sans SC, Noto Sans CJK SC, Droid Sans Fallback");
-pref("font.name-list.monospace.zh-CN", "Noto Sans Mono CJK SC, Droid Sans Fallback");
-
-pref("font.name.serif.zh-HK", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-HK", "Clear Sans");
-pref("font.name.monospace.zh-HK", "Droid Sans Mono");
-pref("font.name-list.serif.zh-HK", "Noto Serif, Droid Serif, Droid Sans Fallback");
-pref("font.name-list.sans-serif.zh-HK", "Roboto, Droid Sans, Noto Sans TC, Noto Sans SC, Noto Sans CJK TC, Droid Sans Fallback");
-pref("font.name-list.monospace.zh-HK", "Noto Sans Mono CJK TC, Droid Sans Fallback");
-
-pref("font.name.serif.zh-TW", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-TW", "Clear Sans");
-pref("font.name.monospace.zh-TW", "Droid Sans Mono");
-pref("font.name-list.serif.zh-TW", "Noto Serif, Droid Serif, Droid Sans Fallback");
-pref("font.name-list.sans-serif.zh-TW", "Roboto, Droid Sans, Noto Sans TC, Noto Sans SC, Noto Sans CJK TC, Droid Sans Fallback");
-pref("font.name-list.monospace.zh-TW", "Noto Sans Mono CJK TC, Droid Sans Fallback");
-
-pref("font.name.serif.x-math", "Latin Modern Math");
-pref("font.name-list.serif.x-math", "Latin Modern Math, XITS Math, Cambria Math, Libertinus Math, DejaVu Math TeX Gyre, TeX Gyre Bonum Math, TeX Gyre Pagella Math, TeX Gyre Schola, TeX Gyre Termes Math, STIX Math, Asana Math, STIXGeneral, DejaVu Serif, DejaVu Sans, Charis SIL Compact");
-pref("font.name.sans-serif.x-math", "Clear Sans");
-pref("font.name.monospace.x-math", "Droid Sans Mono");
-
-#endif
 
 #if OS_ARCH==AIX
 
@@ -4428,12 +4229,7 @@ pref("canvas.image.cache.limit", 0);
 pref("canvas.poisondata", false);
 
 // WebGL prefs
-#ifdef ANDROID
-// Disable MSAA on mobile.
-pref("gl.msaa-level", 0);
-#else
 pref("gl.msaa-level", 2);
-#endif
 pref("gl.require-hardware", false);
 #ifdef XP_MACOSX
 pref("gl.multithreaded", true);
@@ -4528,13 +4324,7 @@ pref("layers.gpu-process.dev.enabled", true);
 pref("layers.acceleration.draw-fps", false);
 
 // Enable DEAA antialiasing for transformed layers in the compositor
-#if !defined(MOZ_WIDGET_ANDROID)
-// Desktop prefs
 pref("layers.deaa.enabled", true);
-#else
-// Mobile prefs
-pref("layers.deaa.enabled", false);
-#endif
 
 pref("layers.dump", false);
 #ifdef MOZ_DUMP_PAINTING
@@ -4577,10 +4367,6 @@ pref("layers.tile-height", 512);
 pref("layers.tiles.edge-padding", false);
 #endif
 
-#ifdef MOZ_WIDGET_ANDROID
-pref("layers.tiles.edge-padding", true);
-#endif
-
 // Whether to animate simple opacity and transforms on the compositor
 pref("layers.offmainthreadcomposition.async-animations", true);
 
@@ -4597,10 +4383,6 @@ pref("gfx.content.use-native-pushlayer", false);
 
 pref("gfx.content.always-paint", false);
 
-#ifdef ANDROID
-pref("gfx.apitrace.enabled",false);
-#endif
-
 #ifdef MOZ_X11
 pref("gfx.content.use-native-pushlayer", true);
 #ifdef MOZ_WIDGET_GTK
@@ -4834,12 +4616,8 @@ pref("layout.css.expensive-style-struct-assertions.enabled", false);
 // enable JS dump() function.
 pref("browser.dom.window.dump.enabled", false);
 
-#if defined(MOZ_WIDGET_ANDROID)
 // Network Information API
-pref("dom.netinfo.enabled", true);
-#else
 pref("dom.netinfo.enabled", false);
-#endif
 
 #ifdef XP_WIN
 // On 32-bit Windows, fire a low-memory notification if we have less than this
@@ -5303,11 +5081,7 @@ pref("reader.has_used_toolbar", false);
 // Whether to use a vertical or horizontal toolbar.
 pref("reader.toolbar.vertical", true);
 
-#if !defined(ANDROID)
 pref("narrate.enabled", true);
-#else
-pref("narrate.enabled", false);
-#endif
 
 pref("narrate.test", false);
 pref("narrate.rate", 0);
@@ -5382,10 +5156,8 @@ pref("dom.maxHardwareConcurrency", 16);
 // Shutdown the async osfile worker if it's no longer needed.
 pref("osfile.reset_worker_delay", 30000);
 
-#if !defined(MOZ_WIDGET_ANDROID)
 pref("dom.webkitBlink.dirPicker.enabled", true);
 pref("dom.webkitBlink.filesystem.enabled", true);
-#endif
 
 pref("media.block-autoplay-until-in-foreground", true);