Issue #1053 - Part 3a: Remove Android conditionals from /gfx

43 files changed, 32 insertions, 1708 deletions

diff --git a/gfx/2d/Logging.h b/gfx/2d/Logging.h
index e6be2a7e83..534ee3d400 100644
--- a/gfx/2d/Logging.h
+++ b/gfx/2d/Logging.h
@@ -16,9 +16,6 @@
 #endif
 #include "mozilla/Tuple.h"
 
-#if defined(MOZ_WIDGET_ANDROID)
-#include "nsDebug.h"
-#endif
 #include "Point.h"
 #include "BaseRect.h"
 #include "Matrix.h"
@@ -141,9 +138,6 @@ struct BasicLogger
   // in the appropriate places in that method.
   static bool ShouldOutputMessage(int aLevel) {
     if (LoggingPrefs::sGfxLogLevel >= aLevel) {
-#if defined(MOZ_WIDGET_ANDROID)
-      return true;
-#else
 #if defined(MOZ_LOGGING)
       if (MOZ_LOG_TEST(GetGFX2DLog(), PRLogLevelForLevel(aLevel))) {
         return true;
@@ -153,7 +147,6 @@ struct BasicLogger
                  (aLevel < LOG_DEBUG)) {
         return true;
       }
-#endif
     }
     return false;
   }
@@ -174,9 +167,6 @@ struct BasicLogger
     // make the corresponding change in the ShouldOutputMessage method
     // above.
     if (LoggingPrefs::sGfxLogLevel >= aLevel) {
-#if defined(MOZ_WIDGET_ANDROID)
-      printf_stderr("%s%s", aString.c_str(), aNoNewline ? "" : "\n");
-#else
 #if defined(MOZ_LOGGING)
       if (MOZ_LOG_TEST(GetGFX2DLog(), PRLogLevelForLevel(aLevel))) {
         PR_LogPrint("%s%s", aString.c_str(), aNoNewline ? "" : "\n");
@@ -186,7 +176,6 @@ struct BasicLogger
                  (aLevel < LOG_DEBUG)) {
         printf("%s%s", aString.c_str(), aNoNewline ? "" : "\n");
       }
-#endif
     }
   }
 };
diff --git a/gfx/2d/image_operations.cpp b/gfx/2d/image_operations.cpp
index 79fa879d93..e9492a150e 100644
--- a/gfx/2d/image_operations.cpp
+++ b/gfx/2d/image_operations.cpp
@@ -303,7 +303,7 @@ SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source,
   return result;
 #else
   return SkBitmap();
-#endif  // OS_POSIX && !OS_MACOSX && !defined(OS_ANDROID)
+#endif  // OS_POSIX && !OS_MACOSX
 }
 
 // static
diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
index e1742f93d9..4f437d575a 100644
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -201,12 +201,12 @@ FINAL_LIBRARY = 'xul'
 for var in ('USE_CAIRO', 'MOZ2D_HAS_MOZ_CAIRO'):
     DEFINES[var] = True
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
     DEFINES['MOZ_ENABLE_FREETYPE'] = True
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 
 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
index a86e62c544..c5f936ad6b 100644
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -242,11 +242,6 @@ if CONFIG['CLANG_CL']:
         '-Wno-unused-variable',
     ]
 
-# See bug 386897.
-if CONFIG['GNU_CC'] and CONFIG['OS_TARGET'] == 'Android' and CONFIG['MOZ_OPTIMIZE']:
-    CFLAGS += ['-O2']
-    CXXFLAGS += ['-O2']
-
 if CONFIG['MOZ_X11']:
     CFLAGS += CONFIG['XCFLAGS']
 
diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build
index 69ad66ae4f..055b3dcf23 100644
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -156,7 +156,3 @@ if CONFIG['CLANG_CL']:
     CFLAGS += [
         '-Wno-unused-variable',
     ]
-
-# See bug 386897.
-if CONFIG['OS_TARGET'] == 'Android' and CONFIG['MOZ_OPTIMIZE']:
-    CFLAGS += ['-O2']
diff --git a/gfx/gl/GLBlitHelper.cpp b/gfx/gl/GLBlitHelper.cpp
index d59cea8636..da7f5b462d 100644
--- a/gfx/gl/GLBlitHelper.cpp
+++ b/gfx/gl/GLBlitHelper.cpp
@@ -14,12 +14,6 @@
 #include "mozilla/gfx/Matrix.h"
 #include "mozilla/UniquePtr.h"
 
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidSurfaceTexture.h"
-#include "GLImages.h"
-#include "GLLibraryEGL.h"
-#endif
-
 #ifdef XP_MACOSX
 #include "MacIOSurfaceImage.h"
 #include "GLContextCGL.h"
@@ -146,26 +140,6 @@ GLBlitHelper::InitTexQuadProgram(BlitType target)
                                          vTexCoord * uTexCoordMult);  \n\
         }                                                             \n\
     ";
-#ifdef ANDROID /* MOZ_WIDGET_ANDROID */
-    const char kTexExternalBlit_FragShaderSource[] = "\
-        #version 100                                                    \n\
-        #extension GL_OES_EGL_image_external : require                  \n\
-        #ifdef GL_FRAGMENT_PRECISION_HIGH                               \n\
-            precision highp float;                                      \n\
-        #else                                                           \n\
-            precision mediump float;                                    \n\
-        #endif                                                          \n\
-        varying vec2 vTexCoord;                                         \n\
-        uniform mat4 uTextureTransform;                                 \n\
-        uniform samplerExternalOES uTexUnit;                            \n\
-                                                                        \n\
-        void main()                                                     \n\
-        {                                                               \n\
-            gl_FragColor = texture2D(uTexUnit,                          \n\
-                (uTextureTransform * vec4(vTexCoord, 0.0, 1.0)).xy);    \n\
-        }                                                               \n\
-    ";
-#endif
     /* From Rec601:
     [R]   [1.1643835616438356,  0.0,                 1.5960267857142858]      [ Y -  16]
     [G] = [1.1643835616438358, -0.3917622900949137, -0.8129676472377708]    x [Cb - 128]
@@ -257,14 +231,6 @@ GLBlitHelper::InitTexQuadProgram(BlitType target)
         fragShaderPtr = &mTex2DRectBlit_FragShader;
         fragShaderSource = kTex2DRectBlit_FragShaderSource;
         break;
-#ifdef ANDROID
-    case ConvertSurfaceTexture:
-    case ConvertGralloc:
-        programPtr = &mTexExternalBlit_Program;
-        fragShaderPtr = &mTexExternalBlit_FragShader;
-        fragShaderSource = kTexExternalBlit_FragShaderSource;
-        break;
-#endif
     case ConvertPlanarYCbCr:
         programPtr = &mTexYUVPlanarBlit_Program;
         fragShaderPtr = &mTexYUVPlanarBlit_FragShader;
@@ -398,10 +364,6 @@ GLBlitHelper::InitTexQuadProgram(BlitType target)
         // Cache and set attribute and uniform
         mGL->fUseProgram(program);
         switch (target) {
-#ifdef ANDROID
-            case ConvertSurfaceTexture:
-            case ConvertGralloc:
-#endif
             case BlitTex2D:
             case BlitTexRect:
             case ConvertEGLImage: {
@@ -678,67 +640,6 @@ GLBlitHelper::BindAndUploadEGLImage(EGLImage image, GLuint target)
     mGL->fEGLImageTargetTexture2D(target, image);
 }
 
-#ifdef MOZ_WIDGET_ANDROID
-
-#define ATTACH_WAIT_MS 50
-
-bool
-GLBlitHelper::BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage)
-{
-    AndroidSurfaceTexture* surfaceTexture = stImage->GetSurfaceTexture();
-
-    ScopedBindTextureUnit boundTU(mGL, LOCAL_GL_TEXTURE0);
-
-    if (NS_FAILED(surfaceTexture->Attach(mGL, PR_MillisecondsToInterval(ATTACH_WAIT_MS))))
-        return false;
-
-    // UpdateTexImage() changes the EXTERNAL binding, so save it here
-    // so we can restore it after.
-    int oldBinding = 0;
-    mGL->fGetIntegerv(LOCAL_GL_TEXTURE_BINDING_EXTERNAL, &oldBinding);
-
-    surfaceTexture->UpdateTexImage();
-
-    gfx::Matrix4x4 transform;
-    surfaceTexture->GetTransformMatrix(transform);
-
-    mGL->fUniformMatrix4fv(mTextureTransformLoc, 1, false, &transform._11);
-    mGL->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
-
-    surfaceTexture->Detach();
-
-    mGL->fBindTexture(LOCAL_GL_TEXTURE_EXTERNAL, oldBinding);
-    return true;
-}
-
-bool
-GLBlitHelper::BlitEGLImageImage(layers::EGLImageImage* image)
-{
-    EGLImage eglImage = image->GetImage();
-    EGLSync eglSync = image->GetSync();
-
-    if (eglSync) {
-        EGLint status = sEGLLibrary.fClientWaitSync(EGL_DISPLAY(), eglSync, 0, LOCAL_EGL_FOREVER);
-        if (status != LOCAL_EGL_CONDITION_SATISFIED) {
-            return false;
-        }
-    }
-
-    ScopedBindTextureUnit boundTU(mGL, LOCAL_GL_TEXTURE0);
-
-    int oldBinding = 0;
-    mGL->fGetIntegerv(LOCAL_GL_TEXTURE_BINDING_2D, &oldBinding);
-
-    BindAndUploadEGLImage(eglImage, LOCAL_GL_TEXTURE_2D);
-
-    mGL->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
-
-    mGL->fBindTexture(LOCAL_GL_TEXTURE_2D, oldBinding);
-    return true;
-}
-
-#endif
-
 bool
 GLBlitHelper::BlitPlanarYCbCrImage(layers::PlanarYCbCrImage* yuvImage)
 {
@@ -835,16 +736,6 @@ GLBlitHelper::BlitImageToFramebuffer(layers::Image* srcImage,
         srcOrigin = OriginPos::BottomLeft;
         break;
 
-#ifdef MOZ_WIDGET_ANDROID
-    case ImageFormat::SURFACE_TEXTURE:
-        type = ConvertSurfaceTexture;
-        srcOrigin = srcImage->AsSurfaceTextureImage()->GetOriginPos();
-        break;
-    case ImageFormat::EGLIMAGE:
-        type = ConvertEGLImage;
-        srcOrigin = srcImage->AsEGLImageImage()->GetOriginPos();
-        break;
-#endif
 #ifdef XP_MACOSX
     case ImageFormat::MAC_IOSURFACE:
         type = ConvertMacIOSurfaceImage;
@@ -877,14 +768,6 @@ GLBlitHelper::BlitImageToFramebuffer(layers::Image* srcImage,
             return ret;
         }
 
-#ifdef MOZ_WIDGET_ANDROID
-    case ConvertSurfaceTexture:
-        return BlitSurfaceTextureImage(static_cast<layers::SurfaceTextureImage*>(srcImage));
-
-    case ConvertEGLImage:
-        return BlitEGLImageImage(static_cast<layers::EGLImageImage*>(srcImage));
-#endif
-
 #ifdef XP_MACOSX
     case ConvertMacIOSurfaceImage:
         return BlitMacIOSurfaceImage(srcImage->AsMacIOSurfaceImage());
@@ -983,8 +866,7 @@ GLBlitHelper::BlitFramebufferToTexture(GLuint srcFB, GLuint destTex,
                                        GLenum destTarget,
                                        bool internalFBs)
 {
-    // On the Android 4.3 emulator, IsFramebuffer may return false incorrectly.
-    MOZ_ASSERT_IF(mGL->Renderer() != GLRenderer::AndroidEmulator, !srcFB || mGL->fIsFramebuffer(srcFB));
+    MOZ_ASSERT(!srcFB || mGL->fIsFramebuffer(srcFB));
     MOZ_ASSERT(mGL->fIsTexture(destTex));
 
     if (mGL->IsSupported(GLFeature::framebuffer_blit)) {
diff --git a/gfx/gl/GLBlitHelper.h b/gfx/gl/GLBlitHelper.h
index b98c472331..c2858f5913 100644
--- a/gfx/gl/GLBlitHelper.h
+++ b/gfx/gl/GLBlitHelper.h
@@ -107,11 +107,6 @@ class GLBlitHelper final
     void BindAndUploadEGLImage(EGLImage image, GLuint target);
 
     bool BlitPlanarYCbCrImage(layers::PlanarYCbCrImage* yuvImage);
-#ifdef MOZ_WIDGET_ANDROID
-    // Blit onto the current FB.
-    bool BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage);
-    bool BlitEGLImageImage(layers::EGLImageImage* eglImage);
-#endif
 #ifdef XP_MACOSX
     bool BlitMacIOSurfaceImage(layers::MacIOSurfaceImage* ioImage);
 #endif
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index e81bb980c7..72a7bea58b 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -10,9 +10,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <vector>
-#ifdef MOZ_WIDGET_ANDROID
-#include <sys/mman.h>
-#endif
 
 #include "GLBlitHelper.h"
 #include "GLReadTexImageHelper.h"
@@ -47,10 +44,6 @@
 #include "nsCocoaFeatures.h"
 #endif
 
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidBridge.h"
-#endif
-
 namespace mozilla {
 namespace gl {
 
@@ -234,7 +227,7 @@ ParseGLSLVersion(GLContext* gl, uint32_t* out_version)
     }
 
     if (!versionString) {
-        // This happens on the Android emulators. We'll just return 100
+        MOZ_ASSERT(false, "LOCAL_GL_SHADING_LANGUAGE_VERSION undefined, returning 100");
         *out_version = 100;
         return true;
     }
@@ -1056,28 +1049,6 @@ GLContext::InitWithPrefixImpl(const char* prefix, bool trygl)
         // prevents occasional driver crash.
         mNeedsFlushBeforeDeleteFB = true;
     }
-#ifdef MOZ_WIDGET_ANDROID
-    if (mWorkAroundDriverBugs &&
-        (Renderer() == GLRenderer::AdrenoTM305 ||
-         Renderer() == GLRenderer::AdrenoTM320 ||
-         Renderer() == GLRenderer::AdrenoTM330) &&
-        AndroidBridge::Bridge()->GetAPIVersion() < 21) {
-        // Bug 1164027. Driver crashes when functions such as
-        // glTexImage2D fail due to virtual memory exhaustion.
-        mTextureAllocCrashesOnMapFailure = true;
-    }
-#endif
-#if MOZ_WIDGET_ANDROID
-    if (mWorkAroundDriverBugs &&
-        Renderer() == GLRenderer::SGX540 &&
-        AndroidBridge::Bridge()->GetAPIVersion() <= 15) {
-        // Bug 1288446. Driver sometimes crashes when uploading data to a
-        // texture if the render target has changed since the texture was
-        // rendered from. Calling glCheckFramebufferStatus after
-        // glFramebufferTexture2D prevents the crash.
-        mNeedsCheckAfterAttachTextureToFb = true;
-    }
-#endif
 
     mMaxTextureImageSize = mMaxTextureSize;
 
@@ -1810,17 +1781,6 @@ GLContext::InitExtensions()
             MarkExtensionUnsupported(OES_EGL_sync);
         }
 
-#ifdef MOZ_WIDGET_ANDROID
-        if (Vendor() == GLVendor::Imagination &&
-            Renderer() == GLRenderer::SGX544MP &&
-            AndroidBridge::Bridge()->GetAPIVersion() < 21)
-        {
-            // Bug 1026404
-            MarkExtensionUnsupported(OES_EGL_image);
-            MarkExtensionUnsupported(OES_EGL_image_external);
-        }
-#endif
-
         if (Vendor() == GLVendor::ARM &&
             (Renderer() == GLRenderer::Mali400MP ||
              Renderer() == GLRenderer::Mali450MP))
@@ -1829,16 +1789,6 @@ GLContext::InitExtensions()
             MarkExtensionUnsupported(OES_EGL_image_external);
         }
 
-        if (Renderer() == GLRenderer::AndroidEmulator) {
-            // the Android emulator, which we use to run B2G reftests on,
-            // doesn't expose the OES_rgb8_rgba8 extension, but it seems to
-            // support it (tautologically, as it only runs on desktop GL).
-            MarkExtensionSupported(OES_rgb8_rgba8);
-            // there seems to be a similar issue for EXT_texture_format_BGRA8888
-            // on the Android 4.3 emulator
-            MarkExtensionSupported(EXT_texture_format_BGRA8888);
-        }
-
         if (Vendor() == GLVendor::VMware &&
             Renderer() == GLRenderer::GalliumLlvmpipe)
         {
@@ -2037,8 +1987,7 @@ GLContext::AttachBuffersToFB(GLuint colorTex, GLuint colorRB,
                               colorTex,
                               0);
     } else if (colorRB) {
-        // On the Android 4.3 emulator, IsRenderbuffer may return false incorrectly.
-        MOZ_ASSERT_IF(Renderer() != GLRenderer::AndroidEmulator, fIsRenderbuffer(colorRB));
+        MOZ_ASSERT(fIsRenderbuffer(colorRB));
         fFramebufferRenderbuffer(LOCAL_GL_FRAMEBUFFER,
                                  LOCAL_GL_COLOR_ATTACHMENT0,
                                  LOCAL_GL_RENDERBUFFER,
@@ -2046,7 +1995,7 @@ GLContext::AttachBuffersToFB(GLuint colorTex, GLuint colorRB,
     }
 
     if (depthRB) {
-        MOZ_ASSERT_IF(Renderer() != GLRenderer::AndroidEmulator, fIsRenderbuffer(depthRB));
+        MOZ_ASSERT(fIsRenderbuffer(depthRB));
         fFramebufferRenderbuffer(LOCAL_GL_FRAMEBUFFER,
                                  LOCAL_GL_DEPTH_ATTACHMENT,
                                  LOCAL_GL_RENDERBUFFER,
@@ -2054,7 +2003,7 @@ GLContext::AttachBuffersToFB(GLuint colorTex, GLuint colorRB,
     }
 
     if (stencilRB) {
-        MOZ_ASSERT_IF(Renderer() != GLRenderer::AndroidEmulator, fIsRenderbuffer(stencilRB));
+        MOZ_ASSERT(fIsRenderbuffer(stencilRB));
         fFramebufferRenderbuffer(LOCAL_GL_FRAMEBUFFER,
                                  LOCAL_GL_STENCIL_ATTACHMENT,
                                  LOCAL_GL_RENDERBUFFER,
@@ -2934,29 +2883,6 @@ GLContext::fDeleteFramebuffers(GLsizei n, const GLuint* names)
     TRACKING_CONTEXT(DeletedFramebuffers(this, n, names));
 }
 
-#ifdef MOZ_WIDGET_ANDROID
-/**
- * Conservatively estimate whether there is enough available
- * contiguous virtual address space to map a newly allocated texture.
- */
-static bool
-WillTextureMapSucceed(GLsizei width, GLsizei height, GLenum format, GLenum type)
-{
-    bool willSucceed = false;
-    // Some drivers leave large gaps between textures, so require
-    // there to be double the actual size of the texture available.
-    size_t size = width * height * GetBytesPerTexel(format, type) * 2;
-
-    void *p = mmap(nullptr, size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-    if (p != MAP_FAILED) {
-        willSucceed = true;
-        munmap(p, size);
-    }
-
-    return willSucceed;
-}
-#endif // MOZ_WIDGET_ANDROID
-
 void
 GLContext::fTexImage2D(GLenum target, GLint level, GLint internalformat,
                        GLsizei width, GLsizei height, GLint border,
@@ -2969,17 +2895,6 @@ GLContext::fTexImage2D(GLenum target, GLint level, GLint internalformat,
         height = -1;
         border = -1;
     }
-#if MOZ_WIDGET_ANDROID
-    if (mTextureAllocCrashesOnMapFailure) {
-        // We have no way of knowing whether this texture already has
-        // storage allocated for it, and therefore whether this check
-        // is necessary. We must therefore assume it does not and
-        // always perform the check.
-        if (!WillTextureMapSucceed(width, height, internalformat, type)) {
-            return;
-        }
-    }
-#endif
     raw_fTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index f6af638972..5f0f5a4e89 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -788,18 +788,10 @@ private:
 
     static void AssertNotPassingStackBufferToTheGL(const void* ptr);
 
-#ifdef MOZ_WIDGET_ANDROID
-// Record the name of the GL call for better hang stacks on Android.
-#define BEFORE_GL_CALL                              \
-            PROFILER_LABEL_FUNC(                    \
-              js::ProfileEntry::Category::GRAPHICS);\
-            BeforeGLCall(MOZ_FUNCTION_NAME)
-#else
 #define BEFORE_GL_CALL                              \
             do {                                    \
                 BeforeGLCall(MOZ_FUNCTION_NAME);    \
             } while (0)
-#endif
 
 #define AFTER_GL_CALL                               \
             do {                                    \
@@ -815,12 +807,7 @@ private:
 
 #else // ifdef MOZ_GL_DEBUG
 
-#ifdef MOZ_WIDGET_ANDROID
-// Record the name of the GL call for better hang stacks on Android.
-#define BEFORE_GL_CALL PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS)
-#else
 #define BEFORE_GL_CALL do { } while (0)
-#endif
 #define AFTER_GL_CALL do { } while (0)
 #define TRACKING_CONTEXT(a) do {} while (0)
 #define ASSERT_NOT_PASSING_STACK_BUFFER_TO_GL(ptr) do {} while (0)
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index e39858a92e..ad515e6040 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -11,20 +11,7 @@
     #define GET_NATIVE_WINDOW(aWidget) ((EGLNativeWindowType)aWidget->GetNativeData(NS_NATIVE_WINDOW))
 #endif
 
-#ifdef MOZ_WIDGET_ANDROID
-    #define GET_JAVA_SURFACE(aWidget) (aWidget->GetNativeData(NS_JAVA_SURFACE))
-#endif
-
 #if defined(XP_UNIX)
-    #ifdef MOZ_WIDGET_ANDROID
-        #include <android/native_window.h>
-        #include <android/native_window_jni.h>
-    #endif
-
-    #ifdef ANDROID
-        #include <android/log.h>
-        #define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Android" , ## args)
-    #endif
 
     #define GLES2_LIB "libGLESv2.so"
     #define GLES2_LIB2 "libGLESv2.so.2"
@@ -164,22 +151,8 @@ CreateSurfaceForWindow(nsIWidget* widget, const EGLConfig& config) {
     EGLSurface newSurface = nullptr;
 
     MOZ_ASSERT(widget);
-#ifdef MOZ_WIDGET_ANDROID
-    void* javaSurface = GET_JAVA_SURFACE(widget);
-    if (!javaSurface) {
-        MOZ_CRASH("GFX: Failed to get Java surface.\n");
-    }
-    JNIEnv* const env = jni::GetEnvForThread();
-    ANativeWindow* const nativeWindow = ANativeWindow_fromSurface(
-            env, reinterpret_cast<jobject>(javaSurface));
-    newSurface = sEGLLibrary.fCreateWindowSurface(
-            sEGLLibrary.fGetDisplay(EGL_DEFAULT_DISPLAY),
-            config, nativeWindow, 0);
-    ANativeWindow_release(nativeWindow);
-#else
     newSurface = sEGLLibrary.fCreateWindowSurface(EGL_DISPLAY(), config,
                                                   GET_NATIVE_WINDOW(widget), 0);
-#endif
     return newSurface;
 }
 
@@ -229,11 +202,6 @@ GLContextEGL::~GLContextEGL()
 bool
 GLContextEGL::Init()
 {
-#if defined(ANDROID)
-    // We can't use LoadApitraceLibrary here because the GLContext
-    // expects its own handle to the GL library
-    if (!OpenLibrary(APITRACE_LIB))
-#endif
         if (!OpenLibrary(GLES2_LIB)) {
 #if defined(XP_UNIX)
             if (!OpenLibrary(GLES2_LIB2)) {
@@ -432,10 +400,8 @@ GLContextEGL::GetWSIInfo(nsCString* const out) const
     out->AppendLiteral("\nEGL_EXTENSIONS: ");
     out->Append((const char*)sEGLLibrary.fQueryString(EGL_DISPLAY(), LOCAL_EGL_EXTENSIONS));
 
-#ifndef ANDROID // This query will crash some old android.
     out->AppendLiteral("\nEGL_EXTENSIONS(nullptr): ");
     out->Append((const char*)sEGLLibrary.fQueryString(nullptr, LOCAL_EGL_EXTENSIONS));
-#endif
 }
 
 // hold a reference to the given surface
@@ -685,18 +651,6 @@ CreateConfig(EGLConfig* aConfig, nsIWidget* aWidget)
 {
     int32_t depth = gfxPlatform::GetPlatform()->GetScreenDepth();
     if (!CreateConfig(aConfig, depth, aWidget)) {
-#ifdef MOZ_WIDGET_ANDROID
-        // Bug 736005
-        // Android doesn't always support 16 bit so also try 24 bit
-        if (depth == 16) {
-            return CreateConfig(aConfig, 24, aWidget);
-        }
-        // Bug 970096
-        // Some devices that have 24 bit screens only support 16 bit OpenGL?
-        if (depth == 24) {
-            return CreateConfig(aConfig, 16, aWidget);
-        }
-#endif
         return false;
     } else {
         return true;
@@ -771,43 +725,6 @@ GLContextProviderEGL::CreateForWindow(nsIWidget* aWidget, bool aForceAccelerated
     return gl.forget();
 }
 
-#if defined(ANDROID)
-EGLSurface
-GLContextProviderEGL::CreateEGLSurface(void* aWindow)
-{
-    nsCString discardFailureId;
-    if (!sEGLLibrary.EnsureInitialized(false, &discardFailureId)) {
-        MOZ_CRASH("GFX: Failed to load EGL library 4!\n");
-    }
-
-    EGLConfig config;
-    if (!CreateConfig(&config, static_cast<nsIWidget*>(aWindow))) {
-        MOZ_CRASH("GFX: Failed to create EGLConfig 2!\n");
-    }
-
-    MOZ_ASSERT(aWindow);
-
-    EGLSurface surface = sEGLLibrary.fCreateWindowSurface(EGL_DISPLAY(), config, aWindow,
-                                                          0);
-    if (surface == EGL_NO_SURFACE) {
-        MOZ_CRASH("GFX: Failed to create EGLSurface 2!\n");
-    }
-
-    return surface;
-}
-
-void
-GLContextProviderEGL::DestroyEGLSurface(EGLSurface surface)
-{
-    nsCString discardFailureId;
-    if (!sEGLLibrary.EnsureInitialized(false, &discardFailureId)) {
-        MOZ_CRASH("GFX: Failed to load EGL library 5!\n");
-    }
-
-    sEGLLibrary.fDestroySurface(EGL_DISPLAY(), surface);
-}
-#endif // defined(ANDROID)
-
 static void
 FillContextAttribs(bool alpha, bool depth, bool stencil, bool bpp16,
                    bool es3, nsTArray<EGLint>* out)
diff --git a/gfx/gl/GLContextProviderImpl.h b/gfx/gl/GLContextProviderImpl.h
index 7b63905e64..0a5d30eaad 100644
--- a/gfx/gl/GLContextProviderImpl.h
+++ b/gfx/gl/GLContextProviderImpl.h
@@ -10,9 +10,6 @@
 #ifndef GL_CONTEXT_PROVIDER_NAME
 #error GL_CONTEXT_PROVIDER_NAME not defined
 #endif
-#if defined(ANDROID)
-typedef void* EGLSurface;
-#endif // defined(ANDROID)
 
 class GL_CONTEXT_PROVIDER_NAME
 {
@@ -111,11 +108,6 @@ public:
     static already_AddRefed<GLContext>
     CreateWrappingExisting(void* aContext, void* aSurface);
 
-#if defined(ANDROID)
-    static EGLSurface CreateEGLSurface(void* aWindow);
-    static void DestroyEGLSurface(EGLSurface surface);
-#endif // defined(ANDROID)
-
     /**
      * Get a pointer to the global context, creating it if it doesn't exist.
      */
diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
index b8b53f7c27..5b95d83b2b 100644
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -54,46 +54,6 @@ static const char* sEGLExtensionNames[] = {
     "EGL_ANGLE_platform_angle_d3d"
 };
 
-#if defined(ANDROID)
-
-static PRLibrary* LoadApitraceLibrary()
-{
-    // Initialization of gfx prefs here is only needed during the unit tests...
-    gfxPrefs::GetSingleton();
-    if (!gfxPrefs::UseApitrace()) {
-        return nullptr;
-    }
-
-    static PRLibrary* sApitraceLibrary = nullptr;
-
-    if (sApitraceLibrary)
-        return sApitraceLibrary;
-
-    nsCString logFile = Preferences::GetCString("gfx.apitrace.logfile");
-
-    if (logFile.IsEmpty()) {
-        logFile = "firefox.trace";
-    }
-
-    // The firefox process can't write to /data/local, but it can write
-    // to $GRE_HOME/
-    nsAutoCString logPath;
-    logPath.AppendPrintf("%s/%s", getenv("GRE_HOME"), logFile.get());
-
-    // apitrace uses the TRACE_FILE environment variable to determine where
-    // to log trace output to
-    printf_stderr("Logging GL tracing output to %s", logPath.get());
-    setenv("TRACE_FILE", logPath.get(), false);
-
-    printf_stderr("Attempting load of %s\n", APITRACE_LIB);
-
-    sApitraceLibrary = PR_LoadLibrary(APITRACE_LIB);
-
-    return sApitraceLibrary;
-}
-
-#endif // ANDROID
-
 #ifdef XP_WIN
 // see the comment in GLLibraryEGL::EnsureInitialized() for the rationale here.
 static PRLibrary*
@@ -348,13 +308,8 @@ GLLibraryEGL::EnsureInitialized(bool forceAccel, nsACString* const out_failureId
 
 #else // !Windows
 
-    // On non-Windows (Android) we use system copies of libEGL. We look for
-    // the APITrace lib, libEGL.so, and libEGL.so.1 in that order.
-
-#if defined(ANDROID)
-    if (!mEGLLibrary)
-        mEGLLibrary = LoadApitraceLibrary();
-#endif
+    // On non-Windows we use system copies of libEGL. We look for
+    // libEGL.so and libEGL.so.1 in that order.
 
     if (!mEGLLibrary) {
         printf_stderr("Attempting load of libEGL.so\n");
@@ -593,24 +548,6 @@ GLLibraryEGL::EnsureInitialized(bool forceAccel, nsACString* const out_failureId
         MarkExtensionUnsupported(KHR_image_pixmap);
     }
 
-    if (IsExtensionSupported(ANDROID_native_fence_sync)) {
-        GLLibraryLoader::SymLoadStruct nativeFenceSymbols[] = {
-            { (PRFuncPtr*) &mSymbols.fDupNativeFenceFDANDROID, { "eglDupNativeFenceFDANDROID", nullptr } },
-            { nullptr, { nullptr } }
-        };
-
-        bool success = GLLibraryLoader::LoadSymbols(mEGLLibrary,
-                                                    &nativeFenceSymbols[0],
-                                                    lookupFunction);
-        if (!success) {
-            NS_ERROR("EGL supports ANDROID_native_fence_sync without exposing its functions!");
-
-            MarkExtensionUnsupported(ANDROID_native_fence_sync);
-
-            mSymbols.fDupNativeFenceFDANDROID = nullptr;
-        }
-    }
-
     mInitialized = true;
     return true;
 }
@@ -642,12 +579,7 @@ GLLibraryEGL::InitClientExtensions()
 
     const char* rawExtString = nullptr;
 
-#ifndef ANDROID
-    // Bug 1209612: Crashes on a number of android drivers.
-    // Ideally we would only blocklist this there, but for now we don't need the client
-    // extension list on ANDROID (we mostly need it on ANGLE), and we'd rather not crash.
     rawExtString = (const char*)fQueryString(nullptr, LOCAL_EGL_EXTENSIONS);
-#endif
 
     if (!rawExtString) {
         if (shouldDumpExts) {
diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h
index 88fce067ea..e48f2e21be 100644
--- a/gfx/gl/GLLibraryEGL.h
+++ b/gfx/gl/GLLibraryEGL.h
@@ -33,17 +33,6 @@
     typedef void* EGLNativePixmapType;
     typedef void* EGLNativeWindowType;
 
-    #ifdef ANDROID
-        // We only need to explicitly dlopen egltrace
-        // on android as we can use LD_PRELOAD or other tricks
-        // on other platforms. We look for it in /data/local
-        // as that's writeable by all users
-        //
-        // This should really go in GLLibraryEGL.cpp but we currently reference
-        // APITRACE_LIB in GLContextProviderEGL.cpp. Further refactoring
-        // will come in subsequent patches on Bug 732865
-        #define APITRACE_LIB "/data/local/tmp/egltrace.so"
-    #endif
 #endif
 
 #if defined(MOZ_X11)
@@ -79,28 +68,15 @@ namespace gl {
 # endif
 #endif
 
-#ifdef MOZ_WIDGET_ANDROID
-// Record the name of the GL call for better hang stacks on Android.
-#define BEFORE_GL_CALL                      \
-    PROFILER_LABEL_FUNC(                    \
-      js::ProfileEntry::Category::GRAPHICS);\
-    BeforeGLCall(MOZ_FUNCTION_NAME)
-#else
 #define BEFORE_GL_CALL do {          \
     BeforeGLCall(MOZ_FUNCTION_NAME); \
 } while (0)
-#endif
 
 #define AFTER_GL_CALL do {           \
     AfterGLCall(MOZ_FUNCTION_NAME);  \
 } while (0)
-#else
-#ifdef MOZ_WIDGET_ANDROID
-// Record the name of the GL call for better hang stacks on Android.
-#define BEFORE_GL_CALL PROFILER_LABEL_FUNC(js::ProfileEntry::Category::GRAPHICS)
-#else
+#else // !DEBUG
 #define BEFORE_GL_CALL
-#endif
 #define AFTER_GL_CALL
 #endif
 
diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
index 4922932140..d5287ca595 100644
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -16,8 +16,6 @@ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
         gl_provider = 'EGL'
     else:
         gl_provider = 'GLX'
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    gl_provider = 'EGL'
 
 if CONFIG['MOZ_GL_PROVIDER']:
     gl_provider = CONFIG['MOZ_GL_PROVIDER']
diff --git a/gfx/layers/Compositor.cpp b/gfx/layers/Compositor.cpp
index b623b8de92..e091975bf7 100644
--- a/gfx/layers/Compositor.cpp
+++ b/gfx/layers/Compositor.cpp
@@ -28,15 +28,8 @@ Compositor::Compositor(widget::CompositorWidget* aWidget,
   , mScreenRotation(ROTATION_0)
   , mWidget(aWidget)
   , mIsDestroyed(false)
-#if defined(MOZ_WIDGET_ANDROID)
-  // If the default color isn't white for Fennec, there is a black
-  // flash before the first page of a tab is loaded.
-  , mClearColor(1.0, 1.0, 1.0, 1.0)
-  , mDefaultClearColor(1.0, 1.0, 1.0, 1.0)
-#else
   , mClearColor(0.0, 0.0, 0.0, 0.0)
   , mDefaultClearColor(0.0, 0.0, 0.0, 0.0)
-#endif
 {
 }
 
@@ -173,11 +166,7 @@ Compositor::DrawDiagnosticsInternal(DiagnosticFlags aFlags,
                                     const gfx::Matrix4x4& aTransform,
                                     uint32_t aFlashCounter)
 {
-#if defined(ANDROID)
-  int lWidth = 10;
-#else
   int lWidth = 2;
-#endif
 
   gfx::Color color;
   if (aFlags & DiagnosticFlags::CONTENT) {
diff --git a/gfx/layers/GLImages.cpp b/gfx/layers/GLImages.cpp
index c151d991b2..008067df7b 100644
--- a/gfx/layers/GLImages.cpp
+++ b/gfx/layers/GLImages.cpp
@@ -1,3 +1,7 @@
+/* -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GLImages.h"
 #include "GLContext.h"
@@ -98,17 +102,5 @@ GLImage::GetAsSourceSurface()
   return source.forget();
 }
 
-#ifdef MOZ_WIDGET_ANDROID
-SurfaceTextureImage::SurfaceTextureImage(gl::AndroidSurfaceTexture* aSurfTex,
-                                         const gfx::IntSize& aSize,
-                                         gl::OriginPos aOriginPos)
- : GLImage(ImageFormat::SURFACE_TEXTURE),
-   mSurfaceTexture(aSurfTex),
-   mSize(aSize),
-   mOriginPos(aOriginPos)
-{
-}
-#endif
-
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/GLImages.h b/gfx/layers/GLImages.h
index 3e419d4b60..16e31e0538 100644
--- a/gfx/layers/GLImages.h
+++ b/gfx/layers/GLImages.h
@@ -60,34 +60,6 @@ private:
   bool mOwns;
 };
 
-#ifdef MOZ_WIDGET_ANDROID
-
-class SurfaceTextureImage : public GLImage {
-public:
-  SurfaceTextureImage(gl::AndroidSurfaceTexture* aSurfTex,
-                      const gfx::IntSize& aSize,
-                      gl::OriginPos aOriginPos);
-
-  gfx::IntSize GetSize() override { return mSize; }
-  gl::AndroidSurfaceTexture* GetSurfaceTexture() const {
-    return mSurfaceTexture;
-  }
-  gl::OriginPos GetOriginPos() const {
-    return mOriginPos;
-  }
-
-  SurfaceTextureImage* AsSurfaceTextureImage() override {
-    return this;
-  }
-
-private:
-  RefPtr<gl::AndroidSurfaceTexture> mSurfaceTexture;
-  gfx::IntSize mSize;
-  gl::OriginPos mOriginPos;
-};
-
-#endif // MOZ_WIDGET_ANDROID
-
 } // namespace layers
 } // namespace mozilla
 
diff --git a/gfx/layers/ImageContainer.h b/gfx/layers/ImageContainer.h
index a2f404e179..73085ba906 100644
--- a/gfx/layers/ImageContainer.h
+++ b/gfx/layers/ImageContainer.h
@@ -166,9 +166,7 @@ protected:
 class GLImage;
 class EGLImageImage;
 class SharedRGBImage;
-#ifdef MOZ_WIDGET_ANDROID
-class SurfaceTextureImage;
-#elif defined(XP_MACOSX)
+#if defined(XP_MACOSX)
 class MacIOSurfaceImage;
 #endif
 
@@ -225,9 +223,6 @@ public:
   /* Access to derived classes. */
   virtual EGLImageImage* AsEGLImageImage() { return nullptr; }
   virtual GLImage* AsGLImage() { return nullptr; }
-#ifdef MOZ_WIDGET_ANDROID
-  virtual SurfaceTextureImage* AsSurfaceTextureImage() { return nullptr; }
-#endif
 #ifdef XP_MACOSX
   virtual MacIOSurfaceImage* AsMacIOSurfaceImage() { return nullptr; }
 #endif
diff --git a/gfx/layers/LayersLogging.cpp b/gfx/layers/LayersLogging.cpp
index 3d11643603..bf3a139579 100644
--- a/gfx/layers/LayersLogging.cpp
+++ b/gfx/layers/LayersLogging.cpp
@@ -396,18 +396,7 @@ AppendToString(std::stringstream& aStream, ImageFormat format,
 void
 print_stderr(std::stringstream& aStr)
 {
-#if defined(ANDROID)
-  // On Android logcat output is truncated to 1024 chars per line, and
-  // we usually use std::stringstream to build up giant multi-line gobs
-  // of output. So to avoid the truncation we find the newlines and
-  // print the lines individually.
-  std::string line;
-  while (std::getline(aStr, line)) {
-    printf_stderr("%s\n", line.c_str());
-  }
-#else
   printf_stderr("%s", aStr.str().c_str());
-#endif
 }
 
 void
diff --git a/gfx/layers/apz/src/AndroidAPZ.cpp b/gfx/layers/apz/src/AndroidAPZ.cpp
deleted file mode 100644
index 3a2baff86a..0000000000
--- a/gfx/layers/apz/src/AndroidAPZ.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "AndroidAPZ.h"
-
-#include "AsyncPanZoomController.h"
-#include "GeneratedJNIWrappers.h"
-#include "gfxPrefs.h"
-#include "OverscrollHandoffState.h"
-#include "ViewConfiguration.h"
-
-#define ANDROID_APZ_LOG(...)
-// #define ANDROID_APZ_LOG(...) printf_stderr("ANDROID_APZ: " __VA_ARGS__)
-
-static float sMaxFlingSpeed = 0.0f;
-
-namespace mozilla {
-namespace layers {
-
-AndroidSpecificState::AndroidSpecificState() {
-  using namespace mozilla::java;
-
-  sdk::ViewConfiguration::LocalRef config;
-  if (sdk::ViewConfiguration::Get(GeckoAppShell::GetApplicationContext(), &config) == NS_OK) {
-    int32_t speed = 0;
-    if (config->GetScaledMaximumFlingVelocity(&speed) == NS_OK) {
-      sMaxFlingSpeed = (float)speed * 0.001f;
-    } else {
-      ANDROID_APZ_LOG("%p Failed to query ViewConfiguration for scaled maximum fling velocity\n", this);
-    }
-  } else {
-    ANDROID_APZ_LOG("%p Failed to get ViewConfiguration\n", this);
-  }
-
-  StackScroller::LocalRef scroller;
-  if (StackScroller::New(GeckoAppShell::GetApplicationContext(), &scroller) != NS_OK) {
-    ANDROID_APZ_LOG("%p Failed to create Android StackScroller\n", this);
-    return;
-  }
-  mOverScroller = scroller;
-}
-
-const float BOUNDS_EPSILON = 1.0f;
-
-// This function is used to convert the scroll offset from a float to an integer
-// suitable for using with the Android OverScroller Class.
-// The Android OverScroller class (unfortunately) operates in integers instead of floats.
-// When casting a float value such as 1.5 to an integer, the value is converted to 1.
-// If this value represents the max scroll offset, the OverScroller class will never scroll
-// to the end of the page as it will always be 0.5 pixels short. To work around this issue,
-// the min and max scroll extents are floor/ceil to convert them to the nearest integer
-// just outside of the actual scroll extents. This means, the starting
-// scroll offset must be converted the same way so that if the frame has already been
-// scrolled 1.5 pixels, it won't be snapped back when converted to an integer. This integer
-// rounding error was one of several causes of Bug 1276463.
-static int32_t
-ClampStart(float aOrigin, float aMin, float aMax)
-{
-  if (aOrigin <= aMin) {
-    return (int32_t)floor(aMin);
-  } else if (aOrigin >= aMax) {
-    return (int32_t)ceil(aMax);
-  }
-  return (int32_t)aOrigin;
-}
-
-AndroidFlingAnimation::AndroidFlingAnimation(AsyncPanZoomController& aApzc,
-                                             PlatformSpecificStateBase* aPlatformSpecificState,
-                                             const RefPtr<const OverscrollHandoffChain>& aOverscrollHandoffChain,
-                                             bool aFlingIsHandoff,
-                                             const RefPtr<const AsyncPanZoomController>& aScrolledApzc)
-  : mApzc(aApzc)
-  , mOverscrollHandoffChain(aOverscrollHandoffChain)
-  , mScrolledApzc(aScrolledApzc)
-  , mSentBounceX(false)
-  , mSentBounceY(false)
-  , mFlingDuration(0)
-{
-  MOZ_ASSERT(mOverscrollHandoffChain);
-  AndroidSpecificState* state = aPlatformSpecificState->AsAndroidSpecificState();
-  MOZ_ASSERT(state);
-  mOverScroller = state->mOverScroller;
-  MOZ_ASSERT(mOverScroller);
-
-  // Drop any velocity on axes where we don't have room to scroll anyways
-  // (in this APZC, or an APZC further in the handoff chain).
-  // This ensures that we don't take the 'overscroll' path in Sample()
-  // on account of one axis which can't scroll having a velocity.
-  if (!mOverscrollHandoffChain->CanScrollInDirection(&mApzc, Layer::HORIZONTAL)) {
-    ReentrantMonitorAutoEnter lock(mApzc.mMonitor);
-    mApzc.mX.SetVelocity(0);
-  }
-  if (!mOverscrollHandoffChain->CanScrollInDirection(&mApzc, Layer::VERTICAL)) {
-    ReentrantMonitorAutoEnter lock(mApzc.mMonitor);
-    mApzc.mY.SetVelocity(0);
-  }
-
-  ParentLayerPoint velocity = mApzc.GetVelocityVector();
-
-  float scrollRangeStartX = mApzc.mX.GetPageStart().value;
-  float scrollRangeEndX = mApzc.mX.GetScrollRangeEnd().value;
-  float scrollRangeStartY = mApzc.mY.GetPageStart().value;
-  float scrollRangeEndY = mApzc.mY.GetScrollRangeEnd().value;
-  mStartOffset.x = mPreviousOffset.x = mApzc.mX.GetOrigin().value;
-  mStartOffset.y = mPreviousOffset.y = mApzc.mY.GetOrigin().value;
-  float length = velocity.Length();
-  if (length > 0.0f) {
-    mFlingDirection = velocity / length;
-
-    if ((sMaxFlingSpeed > 0.0f) && (length > sMaxFlingSpeed)) {
-       velocity = mFlingDirection * sMaxFlingSpeed;
-    }
-  }
-
-  mPreviousVelocity = velocity;
-
-  int32_t originX = ClampStart(mStartOffset.x, scrollRangeStartX, scrollRangeEndX);
-  int32_t originY = ClampStart(mStartOffset.y, scrollRangeStartY, scrollRangeEndY);
-  if (!state->mLastFling.IsNull()) {
-    // If it's been too long since the previous fling, or if the new fling's
-    // velocity is too low, don't allow flywheel to kick in. If we do allow
-    // flywheel to kick in, then we need to update the timestamp on the
-    // StackScroller because otherwise it might use a stale velocity.
-    TimeDuration flingDuration = TimeStamp::Now() - state->mLastFling;
-    if (flingDuration.ToMilliseconds() < gfxPrefs::APZFlingAccelInterval()
-        && velocity.Length() >= gfxPrefs::APZFlingAccelMinVelocity()) {
-      bool unused = false;
-      mOverScroller->ComputeScrollOffset(flingDuration.ToMilliseconds(), &unused);
-    } else {
-      mOverScroller->ForceFinished(true);
-    }
-  }
-  mOverScroller->Fling(originX, originY,
-                       // Android needs the velocity in pixels per second and it is in pixels per ms.
-                       (int32_t)(velocity.x * 1000.0f), (int32_t)(velocity.y * 1000.0f),
-                       (int32_t)floor(scrollRangeStartX), (int32_t)ceil(scrollRangeEndX),
-                       (int32_t)floor(scrollRangeStartY), (int32_t)ceil(scrollRangeEndY),
-                       0, 0, 0);
-  state->mLastFling = TimeStamp::Now();
-}
-
-/**
- * Advances a fling by an interpolated amount based on the Android OverScroller.
- * This should be called whenever sampling the content transform for this
- * frame. Returns true if the fling animation should be advanced by one frame,
- * or false if there is no fling or the fling has ended.
- */
-bool
-AndroidFlingAnimation::DoSample(FrameMetrics& aFrameMetrics,
-                                const TimeDuration& aDelta)
-{
-  bool shouldContinueFling = true;
-
-  mFlingDuration += aDelta.ToMilliseconds();
-  mOverScroller->ComputeScrollOffset(mFlingDuration, &shouldContinueFling);
-
-  int32_t currentX = 0;
-  int32_t currentY = 0;
-  mOverScroller->GetCurrX(&currentX);
-  mOverScroller->GetCurrY(&currentY);
-  ParentLayerPoint offset((float)currentX, (float)currentY);
-  ParentLayerPoint preCheckedOffset(offset);
-
-  bool hitBoundX = CheckBounds(mApzc.mX, offset.x, mFlingDirection.x, &(offset.x));
-  bool hitBoundY = CheckBounds(mApzc.mY, offset.y, mFlingDirection.y, &(offset.y));
-
-  ParentLayerPoint velocity = mPreviousVelocity;
-
-  // Sometimes the OverScroller fails to update the offset for a frame.
-  // If the frame can still scroll we just use the velocity from the previous
-  // frame. However, if the frame can no longer scroll in the direction
-  // of the fling, then end the animation.
-  if (offset != mPreviousOffset) {
-    if (aDelta.ToMilliseconds() > 0) {
-      mOverScroller->GetCurrSpeedX(&velocity.x);
-      mOverScroller->GetCurrSpeedY(&velocity.y);
-
-      velocity.x /= 1000;
-      velocity.y /= 1000;
-
-      mPreviousVelocity = velocity;
-    }
-  } else if ((fabsf(offset.x - preCheckedOffset.x) > BOUNDS_EPSILON) || (fabsf(offset.y - preCheckedOffset.y) > BOUNDS_EPSILON)) {
-    // The page is no longer scrolling but the fling animation is still animating beyond the page bounds. If it goes
-    // beyond the BOUNDS_EPSILON then it has overflowed and will never stop. In that case, stop the fling animation.
-    shouldContinueFling = false;
-  } else if (hitBoundX && hitBoundY) {
-    // We can't scroll any farther along either axis.
-    shouldContinueFling = false;
-  }
-
-  float speed = velocity.Length();
-
-  // gfxPrefs::APZFlingStoppedThreshold is only used in tests.
-  if (!shouldContinueFling || (speed < gfxPrefs::APZFlingStoppedThreshold())) {
-    if (shouldContinueFling) {
-      // The OverScroller thinks it should continue but the speed is below
-      // the stopping threshold so abort the animation.
-      mOverScroller->AbortAnimation();
-    }
-    // This animation is going to end. If DeferHandleFlingOverscroll
-    // has not been called and there is still some velocity left,
-    // call it so that fling hand off may occur if applicable.
-    if (!mSentBounceX && !mSentBounceY && (speed > 0.0f)) {
-      DeferHandleFlingOverscroll(velocity);
-    }
-    return false;
-  }
-
-  mPreviousOffset = offset;
-
-  mApzc.SetVelocityVector(velocity);
-  aFrameMetrics.SetScrollOffset(offset / aFrameMetrics.GetZoom());
-
-  // If we hit a bounds while flinging, send the velocity so that the bounce
-  // animation can play.
-  if (hitBoundX || hitBoundY) {
-    ParentLayerPoint bounceVelocity = velocity;
-
-    if (!mSentBounceX && hitBoundX && fabsf(offset.x - mStartOffset.x) > BOUNDS_EPSILON) {
-      mSentBounceX = true;
-    } else {
-      bounceVelocity.x = 0.0f;
-    }
-
-    if (!mSentBounceY && hitBoundY && fabsf(offset.y - mStartOffset.y) > BOUNDS_EPSILON) {
-      mSentBounceY = true;
-    } else {
-      bounceVelocity.y = 0.0f;
-    }
-    if (!IsZero(bounceVelocity)) {
-      DeferHandleFlingOverscroll(bounceVelocity);
-    }
-  }
-
-  return true;
-}
-
-void
-AndroidFlingAnimation::DeferHandleFlingOverscroll(ParentLayerPoint& aVelocity)
-{
-  mDeferredTasks.AppendElement(
-      NewRunnableMethod<ParentLayerPoint,
-                        RefPtr<const OverscrollHandoffChain>,
-                        RefPtr<const AsyncPanZoomController>>(&mApzc,
-                                                              &AsyncPanZoomController::HandleFlingOverscroll,
-                                                              aVelocity,
-                                                              mOverscrollHandoffChain,
-                                                              mScrolledApzc));
-
-}
-
-bool
-AndroidFlingAnimation::CheckBounds(Axis& aAxis, float aValue, float aDirection, float* aClamped)
-{
-  if ((aDirection < 0.0f) && (aValue <= aAxis.GetPageStart().value)) {
-    if (aClamped) {
-      *aClamped = aAxis.GetPageStart().value;
-    }
-    return true;
-  } else if ((aDirection > 0.0f) && (aValue >= aAxis.GetScrollRangeEnd().value)) {
-    if (aClamped) {
-      *aClamped = aAxis.GetScrollRangeEnd().value;
-    }
-    return true;
-  }
-  return false;
-}
-
-} // namespace layers
-} // namespace mozilla
diff --git a/gfx/layers/apz/src/AndroidAPZ.h b/gfx/layers/apz/src/AndroidAPZ.h
deleted file mode 100644
index 248f2fbe7e..0000000000
--- a/gfx/layers/apz/src/AndroidAPZ.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_layers_AndroidAPZ_h_
-#define mozilla_layers_AndroidAPZ_h_
-
-#include "AsyncPanZoomAnimation.h"
-#include "AsyncPanZoomController.h"
-#include "GeneratedJNIWrappers.h"
-
-namespace mozilla {
-namespace layers {
-
-class AndroidSpecificState : public PlatformSpecificStateBase {
-public:
-  AndroidSpecificState();
-
-  virtual AndroidSpecificState* AsAndroidSpecificState() override {
-    return this;
-  }
-
-  java::StackScroller::GlobalRef mOverScroller;
-  TimeStamp mLastFling;
-};
-
-class AndroidFlingAnimation: public AsyncPanZoomAnimation {
-public:
-  AndroidFlingAnimation(AsyncPanZoomController& aApzc,
-                        PlatformSpecificStateBase* aPlatformSpecificState,
-                        const RefPtr<const OverscrollHandoffChain>& aOverscrollHandoffChain,
-                        bool aFlingIsHandoff /* ignored */,
-                        const RefPtr<const AsyncPanZoomController>& aScrolledApzc);
-  virtual bool DoSample(FrameMetrics& aFrameMetrics,
-                        const TimeDuration& aDelta) override;
-private:
-  void DeferHandleFlingOverscroll(ParentLayerPoint& aVelocity);
-  // Returns true if value is on or outside of axis bounds.
-  bool CheckBounds(Axis& aAxis, float aValue, float aDirection, float* aClamped);
-
-  AsyncPanZoomController& mApzc;
-  java::StackScroller::GlobalRef mOverScroller;
-  RefPtr<const OverscrollHandoffChain> mOverscrollHandoffChain;
-  RefPtr<const AsyncPanZoomController> mScrolledApzc;
-  bool mSentBounceX;
-  bool mSentBounceY;
-  long mFlingDuration;
-  ParentLayerPoint mStartOffset;
-  ParentLayerPoint mPreviousOffset;
-  // Unit vector in the direction of the fling.
-  ParentLayerPoint mFlingDirection;
-  ParentLayerPoint mPreviousVelocity;
-};
-
-
-} // namespace layers
-} // namespace mozilla
-
-#endif // mozilla_layers_AndroidAPZ_h_
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index 772590356a..4808daf49c 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -75,9 +75,6 @@
 #include "SharedMemoryBasic.h"          // for SharedMemoryBasic
 #include "ScrollSnap.h"                 // for ScrollSnapUtils
 #include "WheelScrollAnimation.h"
-#if defined(MOZ_WIDGET_ANDROID)
-#include "AndroidAPZ.h"
-#endif // defined(MOZ_WIDGET_ANDROID)
 
 #define ENABLE_APZC_LOGGING 0
 // #define ENABLE_APZC_LOGGING 1
@@ -110,16 +107,10 @@ using mozilla::gfx::PointTyped;
 using mozilla::gfx::RectTyped;
 using mozilla::gfx::ScaleFactors2D;
 
-// Choose between platform-specific implementations.
-#ifdef MOZ_WIDGET_ANDROID
-typedef WidgetOverscrollEffect OverscrollEffect;
-typedef AndroidSpecificState PlatformSpecificState;
-typedef AndroidFlingAnimation FlingAnimation;
-#else
+// Platform-specific implementations.
 typedef GenericOverscrollEffect OverscrollEffect;
 typedef PlatformSpecificStateBase PlatformSpecificState;  // no extra state, just use the base class
 typedef GenericFlingAnimation FlingAnimation;
-#endif
 
 /**
  * \page APZCPrefs APZ preferences
@@ -250,7 +241,6 @@ typedef GenericFlingAnimation FlingAnimation;
  * for a new sample, v(t0) is the velocity at the previous sample, f is the
  * value of this pref, and (t1 - t0) is the amount of time, in milliseconds,
  * that has elapsed between the two samples.\n
- * NOTE: Not currently used in Android fling calculations.
  *
  * \li\b apz.fling_min_velocity_threshold
  * Minimum velocity for a fling to actually kick off. If the user pans and lifts
@@ -271,8 +261,6 @@ typedef GenericFlingAnimation FlingAnimation;
  * animation completely. This is to prevent asymptotically approaching 0
  * velocity and rerendering unnecessarily.\n
  * Units: screen pixels per millisecond.\n
- * NOTE: Should not be set to anything
- * other than 0.0 for Android except for tests to disable flings.
  *
  * \li\b apz.max_velocity_inches_per_ms
  * Maximum velocity.  Velocity will be capped at this value if a faster fling
diff --git a/gfx/layers/apz/util/APZCCallbackHelper.cpp b/gfx/layers/apz/util/APZCCallbackHelper.cpp
index 3f33a59e43..2fda14719b 100644
--- a/gfx/layers/apz/util/APZCCallbackHelper.cpp
+++ b/gfx/layers/apz/util/APZCCallbackHelper.cpp
@@ -580,18 +580,7 @@ GetRootDocumentElementFor(nsIWidget* aWidget)
 static nsIFrame*
 UpdateRootFrameForTouchTargetDocument(nsIFrame* aRootFrame)
 {
-#if defined(MOZ_WIDGET_ANDROID)
-  // Re-target so that the hit test is performed relative to the frame for the
-  // Root Content Document instead of the Root Document which are different in
-  // Android. See bug 1229752 comment 16 for an explanation of why this is necessary.
-  if (nsIDocument* doc = aRootFrame->PresContext()->PresShell()->GetTouchEventTargetDocument()) {
-    if (nsIPresShell* shell = doc->GetShell()) {
-      if (nsIFrame* frame = shell->GetRootFrame()) {
-        return frame;
-      }
-    }
-  }
-#endif
+  // No retargeting needed on desktop.
   return aRootFrame;
 }
 
diff --git a/gfx/layers/apz/util/APZEventState.cpp b/gfx/layers/apz/util/APZEventState.cpp
index 20a41eed5a..00a18d7b26 100644
--- a/gfx/layers/apz/util/APZEventState.cpp
+++ b/gfx/layers/apz/util/APZEventState.cpp
@@ -479,11 +479,8 @@ APZEventState::ProcessAPZStateChange(ViewID aViewId,
 void
 APZEventState::ProcessClusterHit()
 {
-  // If we hit a cluster of links then we shouldn't activate any of them,
-  // as we will be showing the zoomed view. (This is only called on Fennec).
-#ifndef MOZ_WIDGET_ANDROID
-  MOZ_ASSERT(false);
-#endif
+  // If we hit a cluster of links then we shouldn't activate any of them.
+  MOZ_ASSERT(false, "Cluster hits shouldn't happen on desktop!");
   mActiveElementManager->ClearActivation();
 }
 
diff --git a/gfx/layers/apz/util/APZThreadUtils.cpp b/gfx/layers/apz/util/APZThreadUtils.cpp
index 46f67d010f..e1975a2a06 100644
--- a/gfx/layers/apz/util/APZThreadUtils.cpp
+++ b/gfx/layers/apz/util/APZThreadUtils.cpp
@@ -6,9 +6,6 @@
 #include "mozilla/layers/APZThreadUtils.h"
 
 #include "mozilla/layers/Compositor.h"
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidBridge.h"
-#endif
 
 namespace mozilla {
 namespace layers {
@@ -57,15 +54,6 @@ APZThreadUtils::RunOnControllerThread(already_AddRefed<Runnable> aTask)
 {
   RefPtr<Runnable> task = aTask;
 
-#ifdef MOZ_WIDGET_ANDROID
-  // This is needed while nsWindow::ConfigureAPZControllerThread is not propper
-  // implemented.
-  if (AndroidBridge::IsJavaUiThread()) {
-    task->Run();
-  } else {
-    AndroidBridge::Bridge()->PostTaskToUiThread(task.forget(), 0);
-  }
-#else
   if (!sControllerThread) {
     // Could happen on startup
     NS_WARNING("Dropping task posted to controller thread");
@@ -77,17 +65,12 @@ APZThreadUtils::RunOnControllerThread(already_AddRefed<Runnable> aTask)
   } else {
     sControllerThread->PostTask(task.forget());
   }
-#endif
 }
 
 /*static*/ bool
 APZThreadUtils::IsControllerThread()
 {
-#ifdef MOZ_WIDGET_ANDROID
-  return AndroidBridge::IsJavaUiThread();
-#else
   return sControllerThread == MessageLoop::current();
-#endif
 }
 
 NS_IMPL_ISUPPORTS(GenericTimerCallbackBase, nsITimerCallback)
diff --git a/gfx/layers/basic/BasicPaintedLayer.cpp b/gfx/layers/basic/BasicPaintedLayer.cpp
index 7ce0c24af7..d2c456daa1 100644
--- a/gfx/layers/basic/BasicPaintedLayer.cpp
+++ b/gfx/layers/basic/BasicPaintedLayer.cpp
@@ -149,7 +149,6 @@ BasicPaintedLayer::Validate(LayerManager::DrawPaintedLayerCallback aCallback,
   }
 
   uint32_t flags = 0;
-#ifndef MOZ_WIDGET_ANDROID
   if (BasicManager()->CompositorMightResample()) {
     flags |= RotatedContentBuffer::PAINT_WILL_RESAMPLE;
   }
@@ -158,7 +157,6 @@ BasicPaintedLayer::Validate(LayerManager::DrawPaintedLayerCallback aCallback,
       flags |= RotatedContentBuffer::PAINT_WILL_RESAMPLE;
     }
   }
-#endif
   if (mDrawAtomically) {
     flags |= RotatedContentBuffer::PAINT_NO_ROTATION;
   }
diff --git a/gfx/layers/client/ClientLayerManager.cpp b/gfx/layers/client/ClientLayerManager.cpp
index 1e4369bcee..ddca3ec3c1 100644
--- a/gfx/layers/client/ClientLayerManager.cpp
+++ b/gfx/layers/client/ClientLayerManager.cpp
@@ -31,10 +31,6 @@
 #include "TiledLayerBuffer.h"
 #include "mozilla/dom/WindowBinding.h"  // for Overfill Callback
 #include "FrameLayerBuilder.h"          // for FrameLayerbuilder
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidBridge.h"
-#include "LayerMetricsWrapper.h"
-#endif
 #ifdef XP_WIN
 #include "mozilla/gfx/DeviceManagerDx.h"
 #endif
@@ -250,7 +246,7 @@ ClientLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
   //
   // Desktop does not support async zoom yet, so we ignore this for those
   // platforms.
-#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_UIKIT)
+#if defined(MOZ_WIDGET_UIKIT)
   if (mWidget && mWidget->GetOwningTabChild()) {
     mCompositorMightResample = AsyncPanZoomEnabled();
   }
diff --git a/gfx/layers/client/ClientTiledPaintedLayer.cpp b/gfx/layers/client/ClientTiledPaintedLayer.cpp
index 5a07681f6d..599fb972c4 100644
--- a/gfx/layers/client/ClientTiledPaintedLayer.cpp
+++ b/gfx/layers/client/ClientTiledPaintedLayer.cpp
@@ -150,11 +150,6 @@ ClientTiledPaintedLayer::BeginPaint()
 
   if (!displayPortAncestor || !scrollAncestor) {
     // No displayport or scroll ancestor, so we can't do progressive rendering.
-#if defined(MOZ_WIDGET_ANDROID)
-    // Both Android and b2g on phones are guaranteed to have a displayport set, so this
-    // should never happen.
-    NS_WARNING("Tiled PaintedLayer with no scrollable container ancestor");
-#endif
     return;
   }
 
diff --git a/gfx/layers/client/ImageClient.cpp b/gfx/layers/client/ImageClient.cpp
index 1ccb69502f..e5a725c277 100644
--- a/gfx/layers/client/ImageClient.cpp
+++ b/gfx/layers/client/ImageClient.cpp
@@ -128,13 +128,6 @@ ImageClient::CreateTextureClientForImage(Image* aImage, KnowsCompositor* aForwar
       EGLImageImage* typedImage = aImage->AsEGLImageImage();
       texture = EGLImageTextureData::CreateTextureClient(
         typedImage, size, aForwarder->GetTextureForwarder(), TextureFlags::DEFAULT);
-#ifdef MOZ_WIDGET_ANDROID
-    } else if (aImage->GetFormat() == ImageFormat::SURFACE_TEXTURE) {
-      SurfaceTextureImage* typedImage = aImage->AsSurfaceTextureImage();
-      texture = AndroidSurfaceTextureData::CreateTextureClient(
-        typedImage->GetSurfaceTexture(), size, typedImage->GetOriginPos(),
-        aForwarder->GetTextureForwarder(), TextureFlags::DEFAULT);
-#endif
     } else {
       MOZ_ASSERT(false, "Bad ImageFormat.");
     }
diff --git a/gfx/layers/client/TiledContentClient.cpp b/gfx/layers/client/TiledContentClient.cpp
index c5677a8a31..164e76da8c 100644
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -1230,19 +1230,7 @@ ClientMultiTiledLayerBuffer::ComputeProgressiveUpdateRegion(const nsIntRegion& a
   // Compute a "coherent update rect" that we should paint all at once in a
   // single transaction. This is to avoid rendering glitches on animated
   // page content, and when layers change size/shape.
-  // On Fennec uploads are more expensive because we're not using gralloc, so
-  // we use a coherent update rect that is intersected with the screen at the
-  // time of issuing the draw command. This will paint faster but also potentially
-  // make the progressive paint more visible to the user while scrolling.
-  // On B2G uploads are cheaper and we value coherency more, especially outside
-  // the browser, so we always use the entire user-visible area.
-  IntRect coherentUpdateRect(RoundedOut(
-#ifdef MOZ_WIDGET_ANDROID
-    transformedCompositionBounds->Intersect(aPaintData->mCompositionBounds)
-#else
-    *transformedCompositionBounds
-#endif
-  ).ToUnknownRect());
+  IntRect coherentUpdateRect(RoundedOut(*transformedCompositionBounds).ToUnknownRect());
 
   TILING_LOG("TILING %p: Progressive update final coherency rect %s\n", &mPaintedLayer, Stringify(coherentUpdateRect).c_str());
 
diff --git a/gfx/layers/composite/AsyncCompositionManager.cpp b/gfx/layers/composite/AsyncCompositionManager.cpp
index cb6b23b0ca..e1938392f6 100644
--- a/gfx/layers/composite/AsyncCompositionManager.cpp
+++ b/gfx/layers/composite/AsyncCompositionManager.cpp
@@ -38,10 +38,6 @@
 #include "nsTArrayForwardDeclare.h"     // for InfallibleTArray
 #include "UnitTransforms.h"             // for TransformTo
 #include "gfxPrefs.h"
-#if defined(MOZ_WIDGET_ANDROID)
-# include <android/log.h>
-# include "mozilla/widget/AndroidCompositorWidget.h"
-#endif
 #include "GeckoProfiler.h"
 #include "FrameUniformityData.h"
 #include "TreeTraversal.h"              // for ForEachNode, BreadthFirstSearch
@@ -825,11 +821,7 @@ ExpandRootClipRect(Layer* aLayer, const ScreenMargin& aFixedLayerMargins)
   // clear the clip rect on aLayer entirely but this seems more precise.
   Maybe<ParentLayerIntRect> rootClipRect = aLayer->AsLayerComposite()->GetShadowClipRect();
   if (rootClipRect && aFixedLayerMargins != ScreenMargin()) {
-#ifndef MOZ_WIDGET_ANDROID
-    // We should never enter here on anything other than Fennec, since
-    // aFixedLayerMargins should be empty everywhere else.
-    MOZ_ASSERT(false);
-#endif
+    MOZ_ASSERT(false, "aFixedLayerMargins should be empty!");
     ParentLayerRect rect(rootClipRect.value());
     rect.Deflate(ViewAs<ParentLayerPixel>(aFixedLayerMargins,
       PixelCastJustification::ScreenIsParentLayerForRoot));
@@ -837,40 +829,6 @@ ExpandRootClipRect(Layer* aLayer, const ScreenMargin& aFixedLayerMargins)
   }
 }
 
-#ifdef MOZ_WIDGET_ANDROID
-static void
-MoveScrollbarForLayerMargin(Layer* aRoot, FrameMetrics::ViewID aRootScrollId,
-                            const ScreenMargin& aFixedLayerMargins)
-{
-  // See bug 1223928 comment 9 - once we can detect the RCD with just the
-  // isRootContent flag on the metrics, we can probably move this code into
-  // ApplyAsyncTransformToScrollbar rather than having it as a separate
-  // adjustment on the layer tree.
-  Layer* scrollbar = BreadthFirstSearch<ReverseIterator>(aRoot,
-    [aRootScrollId](Layer* aNode) {
-      return (aNode->GetScrollbarDirection() == Layer::HORIZONTAL &&
-              aNode->GetScrollbarTargetContainerId() == aRootScrollId);
-    });
-  if (scrollbar) {
-    // Shift the horizontal scrollbar down into the new space exposed by the
-    // dynamic toolbar hiding. Technically we should also scale the vertical
-    // scrollbar a bit to expand into the new space but it's not as noticeable
-    // and it would add a lot more complexity, so we're going with the "it's not
-    // worth it" justification.
-    TranslateShadowLayer(scrollbar, ParentLayerPoint(0, -aFixedLayerMargins.bottom), true, nullptr);
-    if (scrollbar->GetParent()) {
-      // The layer that has the HORIZONTAL direction sits inside another
-      // ContainerLayer. This ContainerLayer also has a clip rect that causes
-      // the scrollbar to get clipped. We need to expand that clip rect to
-      // prevent that from happening. This is kind of ugly in that we're
-      // assuming a particular layer tree structure but short of adding more
-      // flags to the layer there doesn't appear to be a good way to do this.
-      ExpandRootClipRect(scrollbar->GetParent(), aFixedLayerMargins);
-    }
-  }
-}
-#endif
-
 bool
 AsyncCompositionManager::ApplyAsyncContentTransformToTree(Layer *aLayer,
                                                           bool* aOutFoundRoot)
@@ -974,50 +932,9 @@ AsyncCompositionManager::ApplyAsyncContentTransformToTree(Layer *aLayer,
           const ScrollMetadata& scrollMetadata = layer->GetScrollMetadata(i);
           const FrameMetrics& metrics = scrollMetadata.GetMetrics();
 
-#if defined(MOZ_WIDGET_ANDROID)
-          // If we find a metrics which is the root content doc, use that. If not, use
-          // the root layer. Since this function recurses on children first we should
-          // only end up using the root layer if the entire tree was devoid of a
-          // root content metrics. This is a temporary solution; in the long term we
-          // should not need the root content metrics at all. See bug 1201529 comment
-          // 6 for details.
-          if (!(*aOutFoundRoot)) {
-            *aOutFoundRoot = metrics.IsRootContent() ||       /* RCD */
-                  (layer->GetParent() == nullptr &&          /* rootmost metrics */
-                   i + 1 >= layer->GetScrollMetadataCount());
-            if (*aOutFoundRoot) {
-              mRootScrollableId = metrics.GetScrollId();
-              CSSToLayerScale geckoZoom = metrics.LayersPixelsPerCSSPixel().ToScaleFactor();
-              if (mIsFirstPaint) {
-                LayerIntPoint scrollOffsetLayerPixels = RoundedToInt(metrics.GetScrollOffset() * geckoZoom);
-                mContentRect = metrics.GetScrollableRect();
-                SetFirstPaintViewport(scrollOffsetLayerPixels,
-                                      geckoZoom,
-                                      mContentRect);
-              } else {
-                ParentLayerPoint scrollOffset = controller->GetCurrentAsyncScrollOffset(
-                    AsyncPanZoomController::RESPECT_FORCE_DISABLE);
-                // Compute the painted displayport in document-relative CSS pixels.
-                CSSRect displayPort(metrics.GetCriticalDisplayPort().IsEmpty() ?
-                    metrics.GetDisplayPort() :
-                    metrics.GetCriticalDisplayPort());
-                displayPort += metrics.GetScrollOffset();
-                SyncFrameMetrics(scrollOffset,
-                    geckoZoom * asyncTransformWithoutOverscroll.mScale,
-                    metrics.GetScrollableRect(), displayPort, geckoZoom, mLayersUpdated,
-                    mPaintSyncId, fixedLayerMargins);
-                mFixedLayerMargins = fixedLayerMargins;
-                mLayersUpdated = false;
-                mPaintSyncId = 0;
-              }
-              mIsFirstPaint = false;
-            }
-          }
-#else
-          // Non-Android platforms still care about this flag being cleared after
+          // We still care about this flag being cleared after
           // the first call to TransformShadowTree().
           mIsFirstPaint = false;
-#endif
 
           // Transform the current local clips by this APZC's async transform. If we're
           // using containerful scrolling, then the clip is not part of the scrolled
@@ -1420,12 +1337,8 @@ AsyncCompositionManager::TransformShadowTree(TimeStamp aCurrentFrame,
     // in Gecko and partially in Java.
     bool foundRoot = false;
     if (ApplyAsyncContentTransformToTree(root, &foundRoot)) {
-#if defined(MOZ_WIDGET_ANDROID)
-      MOZ_ASSERT(foundRoot);
-      if (foundRoot && mFixedLayerMargins != ScreenMargin()) {
-        MoveScrollbarForLayerMargin(root, mRootScrollableId, mFixedLayerMargins);
-      }
-#endif
+      // Fixed margin considerations should go here, but we never encounter
+      // those outside of mobile.
     }
 
     // Advance APZ animations to the next expected vsync timestamp, if we can
@@ -1458,14 +1371,7 @@ AsyncCompositionManager::SetFirstPaintViewport(const LayerIntPoint& aOffset,
                                                const CSSToLayerScale& aZoom,
                                                const CSSRect& aCssPageRect)
 {
-#ifdef MOZ_WIDGET_ANDROID
-  widget::AndroidCompositorWidget* widget =
-      mLayerManager->GetCompositor()->GetWidget()->AsAndroid();
-  if (!widget) {
-    return;
-  }
-  widget->SetFirstPaintViewport(aOffset, aZoom, aCssPageRect);
-#endif
+  // ** STUB **
 }
 
 void
@@ -1478,16 +1384,7 @@ AsyncCompositionManager::SyncFrameMetrics(const ParentLayerPoint& aScrollOffset,
                                           int32_t aPaintSyncId,
                                           ScreenMargin& aFixedLayerMargins)
 {
-#ifdef MOZ_WIDGET_ANDROID
-  widget::AndroidCompositorWidget* widget =
-      mLayerManager->GetCompositor()->GetWidget()->AsAndroid();
-  if (!widget) {
-    return;
-  }
-  widget->SyncFrameMetrics(
-      aScrollOffset, aZoom, aCssPageRect, aDisplayPort, aPaintedResolution,
-      aLayersUpdated, aPaintSyncId, aFixedLayerMargins);
-#endif
+  // ** STUB **
 }
 
 } // namespace layers
diff --git a/gfx/layers/composite/AsyncCompositionManager.h b/gfx/layers/composite/AsyncCompositionManager.h
index 4ec49b1a93..98aaa964e7 100644
--- a/gfx/layers/composite/AsyncCompositionManager.h
+++ b/gfx/layers/composite/AsyncCompositionManager.h
@@ -238,14 +238,6 @@ private:
   LayerTransformRecorder mLayerTransformRecorder;
 
   TimeStamp mPreviousFrameTimeStamp;
-
-#ifdef MOZ_WIDGET_ANDROID
-  // The following two fields are only needed on Fennec with C++ APZ, because
-  // then we need to reposition the gecko scrollbar to deal with the
-  // dynamic toolbar shifting content around.
-  FrameMetrics::ViewID mRootScrollableId;
-  ScreenMargin mFixedLayerMargins;
-#endif
 };
 
 MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(AsyncCompositionManager::TransformsToSkip)
diff --git a/gfx/layers/composite/CanvasLayerComposite.cpp b/gfx/layers/composite/CanvasLayerComposite.cpp
index 86f25b1ee1..5ccbeeab9b 100644
--- a/gfx/layers/composite/CanvasLayerComposite.cpp
+++ b/gfx/layers/composite/CanvasLayerComposite.cpp
@@ -133,18 +133,7 @@ CanvasLayerComposite::CleanupResources()
 gfx::SamplingFilter
 CanvasLayerComposite::GetSamplingFilter()
 {
-  gfx::SamplingFilter filter = mSamplingFilter;
-#ifdef ANDROID
-  // Bug 691354
-  // Using the LINEAR filter we get unexplained artifacts.
-  // Use NEAREST when no scaling is required.
-  Matrix matrix;
-  bool is2D = GetEffectiveTransform().Is2D(&matrix);
-  if (is2D && !ThebesMatrix(matrix).HasNonTranslationOrFlip()) {
-    filter = SamplingFilter::POINT;
-  }
-#endif
-  return filter;
+  return mSamplingFilter;
 }
 
 void
diff --git a/gfx/layers/composite/LayerManagerComposite.cpp b/gfx/layers/composite/LayerManagerComposite.cpp
index 800478d559..0ee11bdfb1 100644
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@@ -54,16 +54,6 @@
 #include "nsPoint.h"                    // for nsIntPoint
 #include "nsRect.h"                     // for mozilla::gfx::IntRect
 #include "nsRegion.h"                   // for nsIntRegion, etc
-#ifdef MOZ_WIDGET_ANDROID
-#include <android/log.h>
-#include <android/native_window.h>
-#endif
-#if defined(MOZ_WIDGET_ANDROID)
-#include "opengl/CompositorOGL.h"
-#include "GLContextEGL.h"
-#include "GLContextProvider.h"
-#include "ScopedGLHelpers.h"
-#endif
 #include "GeckoProfiler.h"
 #include "TextRenderer.h"               // for TextRenderer
 #include "mozilla/layers/CompositorBridgeParent.h"
@@ -490,9 +480,6 @@ LayerManagerComposite::UpdateAndRender()
   }
 
   Render(invalid, opaque);
-#if defined(MOZ_WIDGET_ANDROID)
-  RenderToPresentationSurface();
-#endif
   mGeometryChanged = false;
   mWindowOverlayChanged = false;
 
@@ -618,42 +605,6 @@ LayerManagerComposite::RenderDebugOverlay(const IntRect& aBounds)
     }
 
     float alpha = 1;
-#ifdef ANDROID
-    // Draw a translation delay warning overlay
-    int width;
-    int border;
-    if (!mWarnTime.IsNull() && (now - mWarnTime).ToMilliseconds() < kVisualWarningDuration) {
-      EffectChain effects;
-
-      // Black blorder
-      border = 4;
-      width = 6;
-      effects.mPrimaryEffect = new EffectSolidColor(gfx::Color(0, 0, 0, 1));
-      mCompositor->DrawQuad(gfx::Rect(border, border, aBounds.width - 2 * border, width),
-                            aBounds, effects, alpha, gfx::Matrix4x4());
-      mCompositor->DrawQuad(gfx::Rect(border, aBounds.height - border - width, aBounds.width - 2 * border, width),
-                            aBounds, effects, alpha, gfx::Matrix4x4());
-      mCompositor->DrawQuad(gfx::Rect(border, border + width, width, aBounds.height - 2 * border - width * 2),
-                            aBounds, effects, alpha, gfx::Matrix4x4());
-      mCompositor->DrawQuad(gfx::Rect(aBounds.width - border - width, border + width, width, aBounds.height - 2 * border - 2 * width),
-                            aBounds, effects, alpha, gfx::Matrix4x4());
-
-      // Content
-      border = 5;
-      width = 4;
-      effects.mPrimaryEffect = new EffectSolidColor(gfx::Color(1, 1.f - mWarningLevel, 0, 1));
-      mCompositor->DrawQuad(gfx::Rect(border, border, aBounds.width - 2 * border, width),
-                            aBounds, effects, alpha, gfx::Matrix4x4());
-      mCompositor->DrawQuad(gfx::Rect(border, aBounds.height - border - width, aBounds.width - 2 * border, width),
-                            aBounds, effects, alpha, gfx::Matrix4x4());
-      mCompositor->DrawQuad(gfx::Rect(border, border + width, width, aBounds.height - 2 * border - width * 2),
-                            aBounds, effects, alpha, gfx::Matrix4x4());
-      mCompositor->DrawQuad(gfx::Rect(aBounds.width - border - width, border + width, width, aBounds.height - 2 * border - 2 * width),
-                            aBounds, effects, alpha, gfx::Matrix4x4());
-      SetDebugOverlayWantsNextFrame(true);
-    }
-#endif
-
     float fillRatio = mCompositor->GetFillRatio();
     mFPS->DrawFPS(now, drawFrameColorBars ? 10 : 1, 2, unsigned(fillRatio), mCompositor);
 
@@ -932,8 +883,6 @@ LayerManagerComposite::Render(const nsIntRegion& aInvalidRegion, const nsIntRegi
   mozilla::widget::WidgetRenderingContext widgetContext;
 #if defined(XP_MACOSX)
   widgetContext.mLayerManager = this;
-#elif defined(MOZ_WIDGET_ANDROID)
-  widgetContext.mCompositor = GetCompositor();
 #endif
 
   {
@@ -952,14 +901,6 @@ LayerManagerComposite::Render(const nsIntRegion& aInvalidRegion, const nsIntRegi
   CompositorBench(mCompositor, bounds);
 
   MOZ_ASSERT(mRoot->GetOpacity() == 1);
-#if defined(MOZ_WIDGET_ANDROID)
-  LayerMetricsWrapper wrapper = GetRootContentLayer();
-  if (wrapper) {
-    mCompositor->SetClearColor(wrapper.Metadata().GetBackgroundColor());
-  } else {
-    mCompositor->SetClearColorToDefault();
-  }
-#endif
   if (mRoot->GetClipRect()) {
     clipRect = *mRoot->GetClipRect();
     IntRect rect(clipRect.x, clipRect.y, clipRect.width, clipRect.height);
@@ -1029,182 +970,6 @@ LayerManagerComposite::Render(const nsIntRegion& aInvalidRegion, const nsIntRegi
   RecordFrame();
 }
 
-#if defined(MOZ_WIDGET_ANDROID)
-class ScopedCompositorProjMatrix {
-public:
-  ScopedCompositorProjMatrix(CompositorOGL* aCompositor, const Matrix4x4& aProjMatrix):
-    mCompositor(aCompositor),
-    mOriginalProjMatrix(mCompositor->GetProjMatrix())
-  {
-    mCompositor->SetProjMatrix(aProjMatrix);
-  }
-
-  ~ScopedCompositorProjMatrix()
-  {
-    mCompositor->SetProjMatrix(mOriginalProjMatrix);
-  }
-private:
-  CompositorOGL* const mCompositor;
-  const Matrix4x4 mOriginalProjMatrix;
-};
-
-class ScopedCompostitorSurfaceSize {
-public:
-  ScopedCompostitorSurfaceSize(CompositorOGL* aCompositor, const gfx::IntSize& aSize) :
-    mCompositor(aCompositor),
-    mOriginalSize(mCompositor->GetDestinationSurfaceSize())
-  {
-    mCompositor->SetDestinationSurfaceSize(aSize);
-  }
-  ~ScopedCompostitorSurfaceSize()
-  {
-    mCompositor->SetDestinationSurfaceSize(mOriginalSize);
-  }
-private:
-  CompositorOGL* const mCompositor;
-  const gfx::IntSize mOriginalSize;
-};
-
-class ScopedCompositorRenderOffset {
-public:
-  ScopedCompositorRenderOffset(CompositorOGL* aCompositor, const ScreenPoint& aOffset) :
-    mCompositor(aCompositor),
-    mOriginalOffset(mCompositor->GetScreenRenderOffset())
-  {
-    mCompositor->SetScreenRenderOffset(aOffset);
-  }
-  ~ScopedCompositorRenderOffset()
-  {
-    mCompositor->SetScreenRenderOffset(mOriginalOffset);
-  }
-private:
-  CompositorOGL* const mCompositor;
-  const ScreenPoint mOriginalOffset;
-};
-
-class ScopedContextSurfaceOverride {
-public:
-  ScopedContextSurfaceOverride(GLContextEGL* aContext, void* aSurface) :
-    mContext(aContext)
-  {
-    MOZ_ASSERT(aSurface);
-    mContext->SetEGLSurfaceOverride(aSurface);
-    mContext->MakeCurrent(true);
-  }
-  ~ScopedContextSurfaceOverride()
-  {
-    mContext->SetEGLSurfaceOverride(EGL_NO_SURFACE);
-    mContext->MakeCurrent(true);
-  }
-private:
-  GLContextEGL* const mContext;
-};
-
-void
-LayerManagerComposite::RenderToPresentationSurface()
-{
-#ifdef MOZ_WIDGET_ANDROID
-  nsIWidget* const widget = mCompositor->GetWidget()->RealWidget();
-  auto window = static_cast<ANativeWindow*>(
-      widget->GetNativeData(NS_PRESENTATION_WINDOW));
-
-  if (!window) {
-    return;
-  }
-
-  EGLSurface surface = widget->GetNativeData(NS_PRESENTATION_SURFACE);
-
-  if (!surface) {
-    //create surface;
-    surface = GLContextProviderEGL::CreateEGLSurface(window);
-    if (!surface) {
-      return;
-    }
-
-    widget->SetNativeData(NS_PRESENTATION_SURFACE,
-                          reinterpret_cast<uintptr_t>(surface));
-  }
-
-  CompositorOGL* compositor = mCompositor->AsCompositorOGL();
-  GLContext* gl = compositor->gl();
-  GLContextEGL* egl = GLContextEGL::Cast(gl);
-
-  if (!egl) {
-    return;
-  }
-
-  const IntSize windowSize(ANativeWindow_getWidth(window),
-                           ANativeWindow_getHeight(window));
-
-#endif
-
-  if ((windowSize.width <= 0) || (windowSize.height <= 0)) {
-    return;
-  }
-
-  ScreenRotation rotation = compositor->GetScreenRotation();
-
-  const int actualWidth = windowSize.width;
-  const int actualHeight = windowSize.height;
-
-  const gfx::IntSize originalSize = compositor->GetDestinationSurfaceSize();
-  const nsIntRect originalRect = nsIntRect(0, 0, originalSize.width, originalSize.height);
-
-  int pageWidth = originalSize.width;
-  int pageHeight = originalSize.height;
-  if (rotation == ROTATION_90 || rotation == ROTATION_270) {
-    pageWidth = originalSize.height;
-    pageHeight = originalSize.width;
-  }
-
-  float scale = 1.0;
-
-  if ((pageWidth > actualWidth) || (pageHeight > actualHeight)) {
-    const float scaleWidth = (float)actualWidth / (float)pageWidth;
-    const float scaleHeight = (float)actualHeight / (float)pageHeight;
-    scale = scaleWidth <= scaleHeight ? scaleWidth : scaleHeight;
-  }
-
-  const gfx::IntSize actualSize(actualWidth, actualHeight);
-  ScopedCompostitorSurfaceSize overrideSurfaceSize(compositor, actualSize);
-
-  const ScreenPoint offset((actualWidth - (int)(scale * pageWidth)) / 2, 0);
-  ScopedContextSurfaceOverride overrideSurface(egl, surface);
-
-  Matrix viewMatrix = ComputeTransformForRotation(originalRect,
-                                                  rotation);
-  viewMatrix.Invert(); // unrotate
-  viewMatrix.PostScale(scale, scale);
-  viewMatrix.PostTranslate(offset.x, offset.y);
-  Matrix4x4 matrix = Matrix4x4::From2D(viewMatrix);
-
-  mRoot->ComputeEffectiveTransforms(matrix);
-  nsIntRegion opaque;
-  LayerIntRegion visible;
-  PostProcessLayers(mRoot, opaque, visible, Nothing());
-
-  nsIntRegion invalid;
-  IntRect bounds = IntRect::Truncate(0, 0, scale * pageWidth, actualHeight);
-  IntRect rect, actualBounds;
-  MOZ_ASSERT(mRoot->GetOpacity() == 1);
-  mCompositor->BeginFrame(invalid, nullptr, bounds, nsIntRegion(), &rect, &actualBounds);
-
-  // The Java side of Fennec sets a scissor rect that accounts for
-  // chrome such as the URL bar. Override that so that the entire frame buffer
-  // is cleared.
-  ScopedScissorRect scissorRect(egl, 0, 0, actualWidth, actualHeight);
-  egl->fClearColor(0.0, 0.0, 0.0, 0.0);
-  egl->fClear(LOCAL_GL_COLOR_BUFFER_BIT);
-
-  const IntRect clipRect = IntRect::Truncate(0, 0, actualWidth, actualHeight);
-
-  RootLayer()->Prepare(RenderTargetIntRect::FromUnknownRect(clipRect));
-  RootLayer()->RenderLayer(clipRect);
-
-  mCompositor->EndFrame();
-}
-#endif
-
 already_AddRefed<PaintedLayerComposite>
 LayerManagerComposite::CreatePaintedLayerComposite()
 {
diff --git a/gfx/layers/composite/LayerManagerComposite.h b/gfx/layers/composite/LayerManagerComposite.h
index 8fe7a6b34a..ea4b203ac4 100644
--- a/gfx/layers/composite/LayerManagerComposite.h
+++ b/gfx/layers/composite/LayerManagerComposite.h
@@ -327,9 +327,6 @@ private:
    * Render the current layer tree to the active target.
    */
   void Render(const nsIntRegion& aInvalidRegion, const nsIntRegion& aOpaqueRegion);
-#if defined(MOZ_WIDGET_ANDROID)
-  void RenderToPresentationSurface();
-#endif
 
   /**
    * We need to know our invalid region before we're ready to render.
diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp
index e6bf2d991a..25ac10130d 100644
--- a/gfx/layers/ipc/CompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -369,16 +369,6 @@ CompositorVsyncScheduler::ScheduleComposition()
   if (mAsapScheduling) {
     // Used only for performance testing purposes
     PostCompositeTask(TimeStamp::Now());
-#ifdef MOZ_WIDGET_ANDROID
-  } else if (mNeedsComposite >= 2 && mIsObservingVsync) {
-    // uh-oh, we already requested a composite at least twice so far, and a
-    // composite hasn't happened yet. It is possible that the vsync observation
-    // is blocked on the main thread, so let's just composite ASAP and not
-    // wait for the vsync. Note that this should only ever happen on Fennec
-    // because there content runs in the same process as the compositor, and so
-    // content can actually block the main thread in this process.
-    PostCompositeTask(TimeStamp::Now());
-#endif
   } else {
     SetNeedsComposite();
   }
@@ -953,11 +943,6 @@ CompositorBridgeParent::ResumeComposition()
   MonitorAutoLock lock(mResumeCompositionMonitor);
 
   if (!mCompositor->Resume()) {
-#ifdef MOZ_WIDGET_ANDROID
-    // We can't get a surface. This could be because the activity changed between
-    // the time resume was scheduled and now.
-    __android_log_print(ANDROID_LOG_INFO, "CompositorBridgeParent", "Unable to renew compositor surface; remaining in paused state");
-#endif
     lock.NotifyAll();
     return;
   }
diff --git a/gfx/layers/ipc/RemoteContentController.cpp b/gfx/layers/ipc/RemoteContentController.cpp
index 54a08eed3d..d71476a780 100644
--- a/gfx/layers/ipc/RemoteContentController.cpp
+++ b/gfx/layers/ipc/RemoteContentController.cpp
@@ -18,9 +18,6 @@
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/Unused.h"
 #include "Units.h"
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidBridge.h"
-#endif
 
 namespace mozilla {
 namespace layers {
@@ -90,8 +87,7 @@ RemoteContentController::HandleTap(TapType aTapType,
   if (NS_IsMainThread()) {
     HandleTapOnMainThread(aTapType, aPoint, aModifiers, aGuid, aInputBlockId);
   } else {
-    // We don't want to get the TabParent or call TabParent::SendHandleTap() from a non-main thread (this might happen
-    // on Android, where this is called from the Java UI thread)
+    // We don't want to get the TabParent or call TabParent::SendHandleTap() from a non-main thread
     NS_DispatchToMainThread(NewRunnableMethod<TapType, LayoutDevicePoint, Modifiers, ScrollableLayerGuid, uint64_t>
         (this, &RemoteContentController::HandleTapOnMainThread, aTapType, aPoint, aModifiers, aGuid, aInputBlockId));
   }
@@ -139,12 +135,8 @@ RemoteContentController::NotifyPinchGesture(PinchGestureInput::PinchGestureType
 void
 RemoteContentController::PostDelayedTask(already_AddRefed<Runnable> aTask, int aDelayMs)
 {
-#ifdef MOZ_WIDGET_ANDROID
-  AndroidBridge::Bridge()->PostTaskToUiThread(Move(aTask), aDelayMs);
-#else
   (MessageLoop::current() ? MessageLoop::current() : mCompositorThread)->
     PostDelayedTask(Move(aTask), aDelayMs);
-#endif
 }
 
 bool
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index d67bc74d4b..f0fedf404c 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -228,11 +228,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         'opengl/GLManager.cpp',
     ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    SOURCES += [
-        'apz/src/AndroidAPZ.cpp',
-    ]
-
 SOURCES += [
     'apz/public/IAPZCTreeManager.cpp',
     'apz/src/APZCTreeManager.cpp',
diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
index 93656d72a0..6e5a011004 100644
--- a/gfx/layers/opengl/CompositorOGL.cpp
+++ b/gfx/layers/opengl/CompositorOGL.cpp
@@ -43,10 +43,6 @@
 #include "GLBlitTextureImageHelper.h"
 #include "HeapCopyOfStackArray.h"
 
-#if MOZ_WIDGET_ANDROID
-#include "TexturePoolOGL.h"
-#endif
-
 #include "GeckoProfiler.h"
 
 namespace mozilla {
@@ -229,13 +225,6 @@ CompositorOGL::Initialize(nsCString* const out_failureReason)
 
   mGLContext = CreateContext();
 
-#ifdef MOZ_WIDGET_ANDROID
-  if (!mGLContext){
-    *out_failureReason = "FEATURE_FAILURE_OPENGL_NO_ANDROID_CONTEXT";
-    NS_RUNTIMEABORT("We need a context on Android");
-  }
-#endif
-
   if (!mGLContext){
     *out_failureReason = "FEATURE_FAILURE_OPENGL_CREATE_CONTEXT";
     return false;
@@ -673,10 +662,6 @@ CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
   mPixelsPerFrame = width * height;
   mPixelsFilled = 0;
 
-#ifdef MOZ_WIDGET_ANDROID
-  TexturePoolOGL::Fill(gl());
-#endif
-
   // Default blend function implements "OVER"
   mGLContext->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA,
                                  LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA);
@@ -1707,19 +1692,13 @@ CompositorOGL::CopyToTarget(DrawTarget* aTarget, const nsIntPoint& aTopLeft, con
 void
 CompositorOGL::Pause()
 {
-#ifdef MOZ_WIDGET_ANDROID
-  if (!gl() || gl()->IsDestroyed())
-    return;
-
-  // ReleaseSurface internally calls MakeCurrent.
-  gl()->ReleaseSurface();
-#endif
+  // This was only used on Android
 }
 
 bool
 CompositorOGL::Resume()
 {
-#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_UIKIT)
+#if defined(MOZ_WIDGET_UIKIT)
   if (!gl() || gl()->IsDestroyed())
     return false;
 
diff --git a/gfx/layers/opengl/TextureClientOGL.cpp b/gfx/layers/opengl/TextureClientOGL.cpp
index 78d4e6d9c9..1e337717b2 100644
--- a/gfx/layers/opengl/TextureClientOGL.cpp
+++ b/gfx/layers/opengl/TextureClientOGL.cpp
@@ -73,64 +73,5 @@ EGLImageTextureData::Serialize(SurfaceDescriptor& aOutDescriptor)
   return true;
 }
 
-////////////////////////////////////////////////////////////////////////
-// AndroidSurface
-
-#ifdef MOZ_WIDGET_ANDROID
-
-already_AddRefed<TextureClient>
-AndroidSurfaceTextureData::CreateTextureClient(AndroidSurfaceTexture* aSurfTex,
-                                               gfx::IntSize aSize,
-                                               gl::OriginPos aOriginPos,
-                                               LayersIPCChannel* aAllocator,
-                                               TextureFlags aFlags)
-{
-  MOZ_ASSERT(XRE_IsParentProcess(),
-             "Can't pass an android surfaces between processes.");
-
-  if (!aSurfTex || !XRE_IsParentProcess()) {
-    return nullptr;
-  }
-
-  if (aOriginPos == gl::OriginPos::BottomLeft) {
-    aFlags |= TextureFlags::ORIGIN_BOTTOM_LEFT;
-  }
-
-  return TextureClient::CreateWithData(
-    new AndroidSurfaceTextureData(aSurfTex, aSize),
-    aFlags, aAllocator
-  );
-}
-
-AndroidSurfaceTextureData::AndroidSurfaceTextureData(AndroidSurfaceTexture* aSurfTex,
-                                                     gfx::IntSize aSize)
-  : mSurfTex(aSurfTex)
-  , mSize(aSize)
-{}
-
-AndroidSurfaceTextureData::~AndroidSurfaceTextureData()
-{}
-
-void
-AndroidSurfaceTextureData::FillInfo(TextureData::Info& aInfo) const
-{
-  aInfo.size = mSize;
-  aInfo.format = gfx::SurfaceFormat::UNKNOWN;
-  aInfo.hasIntermediateBuffer = false;
-  aInfo.hasSynchronization = false;
-  aInfo.supportsMoz2D = false;
-  aInfo.canExposeMappedData = false;
-}
-
-bool
-AndroidSurfaceTextureData::Serialize(SurfaceDescriptor& aOutDescriptor)
-{
-  aOutDescriptor = SurfaceTextureDescriptor((uintptr_t)mSurfTex.get(),
-                                            mSize);
-  return true;
-}
-
-#endif // MOZ_WIDGET_ANDROID
-
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/opengl/TextureClientOGL.h b/gfx/layers/opengl/TextureClientOGL.h
index 6555f138ad..57e05468a0 100644
--- a/gfx/layers/opengl/TextureClientOGL.h
+++ b/gfx/layers/opengl/TextureClientOGL.h
@@ -48,41 +48,6 @@ protected:
   const gfx::IntSize mSize;
 };
 
-#ifdef MOZ_WIDGET_ANDROID
-
-class AndroidSurfaceTextureData : public TextureData
-{
-public:
-  static already_AddRefed<TextureClient>
-  CreateTextureClient(gl::AndroidSurfaceTexture* aSurfTex,
-                      gfx::IntSize aSize,
-                      gl::OriginPos aOriginPos,
-                      LayersIPCChannel* aAllocator,
-                      TextureFlags aFlags);
-
-  ~AndroidSurfaceTextureData();
-
-  virtual void FillInfo(TextureData::Info& aInfo) const override;
-
-  virtual bool Serialize(SurfaceDescriptor& aOutDescriptor) override;
-
-  // Useless functions.
-  virtual bool Lock(OpenMode) override { return true; }
-
-  virtual void Unlock() override {}
-
-  // Our data is always owned externally.
-  virtual void Deallocate(LayersIPCChannel*) override {}
-
-protected:
-  AndroidSurfaceTextureData(gl::AndroidSurfaceTexture* aSurfTex, gfx::IntSize aSize);
-
-  const RefPtr<gl::AndroidSurfaceTexture> mSurfTex;
-  const gfx::IntSize mSize;
-};
-
-#endif // MOZ_WIDGET_ANDROID
-
 } // namespace layers
 } // namespace mozilla
 
diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp
index 02c398b51f..e4a0f5d953 100644
--- a/gfx/layers/opengl/TextureHostOGL.cpp
+++ b/gfx/layers/opengl/TextureHostOGL.cpp
@@ -40,16 +40,6 @@ CreateTextureHostOGL(const SurfaceDescriptor& aDesc,
 {
   RefPtr<TextureHost> result;
   switch (aDesc.type()) {
-#ifdef MOZ_WIDGET_ANDROID
-    case SurfaceDescriptor::TSurfaceTextureDescriptor: {
-      const SurfaceTextureDescriptor& desc = aDesc.get_SurfaceTextureDescriptor();
-      result = new SurfaceTextureHost(aFlags,
-                                      (AndroidSurfaceTexture*)desc.surfTex(),
-                                      desc.size());
-      break;
-    }
-#endif
-
     case SurfaceDescriptor::TEGLImageDescriptor: {
       const EGLImageDescriptor& desc = aDesc.get_EGLImageDescriptor();
       result = new EGLImageTextureHost(aFlags,
@@ -348,177 +338,6 @@ GLTextureSource::gl() const
 
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
-// SurfaceTextureHost
-
-#ifdef MOZ_WIDGET_ANDROID
-
-SurfaceTextureSource::SurfaceTextureSource(CompositorOGL* aCompositor,
-                                           AndroidSurfaceTexture* aSurfTex,
-                                           gfx::SurfaceFormat aFormat,
-                                           GLenum aTarget,
-                                           GLenum aWrapMode,
-                                           gfx::IntSize aSize)
-  : mCompositor(aCompositor)
-  , mSurfTex(aSurfTex)
-  , mFormat(aFormat)
-  , mTextureTarget(aTarget)
-  , mWrapMode(aWrapMode)
-  , mSize(aSize)
-{
-}
-
-void
-SurfaceTextureSource::BindTexture(GLenum aTextureUnit,
-                                  gfx::SamplingFilter aSamplingFilter)
-{
-  MOZ_ASSERT(mSurfTex);
-  GLContext* gl = this->gl();
-  if (!gl || !gl->MakeCurrent()) {
-    NS_WARNING("Trying to bind a texture without a GLContext");
-    return;
-  }
-
-  gl->fActiveTexture(aTextureUnit);
-
-  // SurfaceTexture spams us if there are any existing GL errors, so
-  // we'll clear them here in order to avoid that.
-  gl->FlushErrors();
-
-  mSurfTex->UpdateTexImage();
-
-  ApplySamplingFilterToBoundTexture(gl, aSamplingFilter, mTextureTarget);
-}
-
-void
-SurfaceTextureSource::SetCompositor(Compositor* aCompositor)
-{
-  CompositorOGL* glCompositor = AssertGLCompositor(aCompositor);
-  if (!glCompositor) {
-    DeallocateDeviceData();
-    return;
-  }
-  if (mCompositor != glCompositor) {
-    DeallocateDeviceData();
-  }
-
-  mCompositor = glCompositor;
-}
-
-bool
-SurfaceTextureSource::IsValid() const
-{
-  return !!gl();
-}
-
-gl::GLContext*
-SurfaceTextureSource::gl() const
-{
-  return mCompositor ? mCompositor->gl() : nullptr;
-}
-
-gfx::Matrix4x4
-SurfaceTextureSource::GetTextureTransform()
-{
-  MOZ_ASSERT(mSurfTex);
-
-  gfx::Matrix4x4 ret;
-  mSurfTex->GetTransformMatrix(ret);
-
-  return ret;
-}
-
-void
-SurfaceTextureSource::DeallocateDeviceData()
-{
-  mSurfTex = nullptr;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-SurfaceTextureHost::SurfaceTextureHost(TextureFlags aFlags,
-                                       AndroidSurfaceTexture* aSurfTex,
-                                       gfx::IntSize aSize)
-  : TextureHost(aFlags)
-  , mSurfTex(aSurfTex)
-  , mSize(aSize)
-  , mCompositor(nullptr)
-{
-}
-
-SurfaceTextureHost::~SurfaceTextureHost()
-{
-}
-
-gl::GLContext*
-SurfaceTextureHost::gl() const
-{
-  return mCompositor ? mCompositor->gl() : nullptr;
-}
-
-bool
-SurfaceTextureHost::Lock()
-{
-  MOZ_ASSERT(mSurfTex);
-  GLContext* gl = this->gl();
-  if (!gl || !gl->MakeCurrent()) {
-    return false;
-  }
-
-  if (!mTextureSource) {
-    gfx::SurfaceFormat format = gfx::SurfaceFormat::R8G8B8A8;
-    GLenum target = LOCAL_GL_TEXTURE_EXTERNAL;
-    GLenum wrapMode = LOCAL_GL_CLAMP_TO_EDGE;
-    mTextureSource = new SurfaceTextureSource(mCompositor,
-                                              mSurfTex,
-                                              format,
-                                              target,
-                                              wrapMode,
-                                              mSize);
-  }
-
-  return NS_SUCCEEDED(mSurfTex->Attach(gl));
-}
-
-void
-SurfaceTextureHost::Unlock()
-{
-  MOZ_ASSERT(mSurfTex);
-  mSurfTex->Detach();
-}
-
-void
-SurfaceTextureHost::SetCompositor(Compositor* aCompositor)
-{
-  CompositorOGL* glCompositor = AssertGLCompositor(aCompositor);
-  if (!glCompositor) {
-    DeallocateDeviceData();
-    return;
-  }
-  mCompositor = glCompositor;
-  if (mTextureSource) {
-    mTextureSource->SetCompositor(glCompositor);
-  }
-}
-
-gfx::SurfaceFormat
-SurfaceTextureHost::GetFormat() const
-{
-  return mTextureSource ? mTextureSource->GetFormat() : gfx::SurfaceFormat::UNKNOWN;
-}
-
-void
-SurfaceTextureHost::DeallocateDeviceData()
-{
-  if (mTextureSource) {
-    mTextureSource->DeallocateDeviceData();
-  }
-  mSurfTex = nullptr;
-}
-
-#endif // MOZ_WIDGET_ANDROID
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
 // EGLImage
 
 EGLImageTextureSource::EGLImageTextureSource(CompositorOGL* aCompositor,
diff --git a/gfx/layers/opengl/TextureHostOGL.h b/gfx/layers/opengl/TextureHostOGL.h
index dd425e768c..f30811b104 100644
--- a/gfx/layers/opengl/TextureHostOGL.h
+++ b/gfx/layers/opengl/TextureHostOGL.h
@@ -336,103 +336,6 @@ protected:
 };
 
 ////////////////////////////////////////////////////////////////////////
-// SurfaceTexture
-
-#ifdef MOZ_WIDGET_ANDROID
-
-class SurfaceTextureSource : public TextureSource
-                           , public TextureSourceOGL
-{
-public:
-  SurfaceTextureSource(CompositorOGL* aCompositor,
-                       mozilla::gl::AndroidSurfaceTexture* aSurfTex,
-                       gfx::SurfaceFormat aFormat,
-                       GLenum aTarget,
-                       GLenum aWrapMode,
-                       gfx::IntSize aSize);
-
-  virtual const char* Name() const override { return "SurfaceTextureSource"; }
-
-  virtual TextureSourceOGL* AsSourceOGL() override { return this; }
-
-  virtual void BindTexture(GLenum activetex,
-                           gfx::SamplingFilter aSamplingFilter) override;
-
-  virtual bool IsValid() const override;
-
-  virtual gfx::IntSize GetSize() const override { return mSize; }
-
-  virtual gfx::SurfaceFormat GetFormat() const override { return mFormat; }
-
-  virtual gfx::Matrix4x4 GetTextureTransform() override;
-
-  virtual GLenum GetTextureTarget() const override { return mTextureTarget; }
-
-  virtual GLenum GetWrapMode() const override { return mWrapMode; }
-
-  virtual void DeallocateDeviceData() override;
-
-  virtual void SetCompositor(Compositor* aCompositor) override;
-
-  gl::GLContext* gl() const;
-
-protected:
-  RefPtr<CompositorOGL> mCompositor;
-  RefPtr<gl::AndroidSurfaceTexture> mSurfTex;
-  const gfx::SurfaceFormat mFormat;
-  const GLenum mTextureTarget;
-  const GLenum mWrapMode;
-  const gfx::IntSize mSize;
-};
-
-class SurfaceTextureHost : public TextureHost
-{
-public:
-  SurfaceTextureHost(TextureFlags aFlags,
-                     mozilla::gl::AndroidSurfaceTexture* aSurfTex,
-                     gfx::IntSize aSize);
-
-  virtual ~SurfaceTextureHost();
-
-  virtual void DeallocateDeviceData() override;
-
-  virtual void SetCompositor(Compositor* aCompositor) override;
-
-  virtual Compositor* GetCompositor() override { return mCompositor; }
-
-  virtual bool Lock() override;
-
-  virtual void Unlock() override;
-
-  virtual gfx::SurfaceFormat GetFormat() const override;
-
-  virtual bool BindTextureSource(CompositableTextureSourceRef& aTexture) override
-  {
-    aTexture = mTextureSource;
-    return !!aTexture;
-  }
-
-  virtual already_AddRefed<gfx::DataSourceSurface> GetAsSurface() override
-  {
-    return nullptr; // XXX - implement this (for MOZ_DUMP_PAINTING)
-  }
-
-  gl::GLContext* gl() const;
-
-  virtual gfx::IntSize GetSize() const override { return mSize; }
-
-  virtual const char* Name() override { return "SurfaceTextureHost"; }
-
-protected:
-  RefPtr<gl::AndroidSurfaceTexture> mSurfTex;
-  const gfx::IntSize mSize;
-  RefPtr<CompositorOGL> mCompositor;
-  RefPtr<SurfaceTextureSource> mTextureSource;
-};
-
-#endif // MOZ_WIDGET_ANDROID
-
-////////////////////////////////////////////////////////////////////////
 // EGLImage
 
 class EGLImageTextureSource : public TextureSource