Issue #1053 - Part 2a: Remove android from /layout (partial)

This removes android code from base, build, forms, generic, inspector, style,
printing, tools and xul.

43 files changed, 56 insertions, 540 deletions

diff --git a/layout/base/AccessibleCaretManager.cpp b/layout/base/AccessibleCaretManager.cpp
index ea73a5379..4dd55009c 100644
--- a/layout/base/AccessibleCaretManager.cpp
+++ b/layout/base/AccessibleCaretManager.cpp
@@ -22,9 +22,6 @@
 #include "nsFrameSelection.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIHapticFeedback.h"
-#ifdef MOZ_WIDGET_ANDROID
-#include "nsWindow.h"
-#endif
 
 namespace mozilla {
 
@@ -896,15 +893,6 @@ AccessibleCaretManager::SetSelectionDragState(bool aState) const
   if (fs) {
     fs->SetDragState(aState);
   }
-
-  // Pin Fennecs DynamicToolbarAnimator in place before/after dragging,
-  // to avoid co-incident screen scrolling.
-  #ifdef MOZ_WIDGET_ANDROID
-    nsIDocument* doc = mPresShell->GetDocument();
-    MOZ_ASSERT(doc);
-    nsIWidget* widget = nsContentUtils::WidgetForDocument(doc);
-    static_cast<nsWindow*>(widget)->SetSelectionDragState(aState);
-  #endif
 }
 
 void
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 934d108e0..8695cd650 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2502,7 +2502,6 @@ ContainerState::PreparePaintedLayerForUse(PaintedLayer* aLayer,
   aData->mVisibilityComputedRegion.SetEmpty();
 
   // FIXME: Temporary workaround for bug 681192 and bug 724786.
-#ifndef MOZ_WIDGET_ANDROID
   // Calculate exact position of the top-left of the active scrolled root.
   // This might not be 0,0 due to the snapping in ScaleToNearestPixels.
   gfxPoint animatedGeometryRootTopLeft = scaledOffset - ThebesPoint(matrix.GetTranslation()) + mParameters.mOffset;
@@ -2515,9 +2514,6 @@ ContainerState::PreparePaintedLayerForUse(PaintedLayer* aLayer,
   } else if (didResetScrollPositionForLayerPixelAlignment) {
     aData->mAnimatedGeometryRootPosition = animatedGeometryRootTopLeft;
   }
-#else
-  Unused << didResetScrollPositionForLayerPixelAlignment;
-#endif
 }
 
 #if defined(DEBUG) || defined(MOZ_DUMP_PAINTING)
diff --git a/layout/base/PositionedEventTargeting.cpp b/layout/base/PositionedEventTargeting.cpp
index 668ff2938..731e951e5 100644
--- a/layout/base/PositionedEventTargeting.cpp
+++ b/layout/base/PositionedEventTargeting.cpp
@@ -620,8 +620,6 @@ FindFrameTargetedByInputEvent(WidgetGUIEvent* aEvent,
   PET_LOG("Final target is %p\n", target);
 
   // Uncomment this to dump the frame tree to help with debugging.
-  // Note that dumping the frame tree at the top of the function may flood
-  // logcat on Android devices and cause the PET_LOGs to get dropped.
   // aRootFrame->DumpFrameTree();
 
   if (!target || !prefs->mRepositionEventCoords) {
diff --git a/layout/base/ZoomConstraintsClient.cpp b/layout/base/ZoomConstraintsClient.cpp
index 2391a116d..67666676b 100644
--- a/layout/base/ZoomConstraintsClient.cpp
+++ b/layout/base/ZoomConstraintsClient.cpp
@@ -53,7 +53,7 @@ GetWidget(nsIPresShell* aShell)
     return nullptr;
   }
   if (nsIFrame* rootFrame = aShell->GetRootFrame()) {
-#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_UIKIT)
+#if defined(MOZ_WIDGET_UIKIT)
     return rootFrame->GetNearestWidget();
 #else
     if (nsView* view = rootFrame->GetView()) {
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 9b09d1c84..1a3bf667b 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -294,7 +294,7 @@ load 469861-1.xhtml
 load 469861-2.xhtml
 load 470851-1.xhtml
 load 471594-1.xhtml
-asserts-if(Android&&!asyncPan,1-2) load 473042.xhtml # bug 1034369 (may also cause a few assertions to be registered on the next test)
+load 473042.xhtml # bug 1034369 (may also cause a few assertions to be registered on the next test)
 asserts(0-5) load 474075.html # bug 847368
 load 477333-1.xhtml
 load 477731-1.html
@@ -411,7 +411,7 @@ load 709536-1.xhtml
 load 722137.html
 load 725535.html
 load 727601.html
-skip-if(Android) asserts(0-2) pref(dom.disable_open_during_load,false) load 735943.html # the assertion is bug 735966, for android bug 760271
+asserts(0-2) pref(dom.disable_open_during_load,false) load 735943.html # the assertion is bug 735966
 asserts(0-2) load 736389-1.xhtml # sometimes the above assertions are delayed and is reported on this test instead
 load 736924-1.html
 load 749816-1.html
@@ -447,7 +447,7 @@ load 866588.html
 load 876092.html
 load 876221.html
 load 897852.html
-asserts(4-6) asserts-if(Android&&!asyncPan,2) load 898913.html # bug 847368
+asserts(4-6) load 898913.html # bug 847368
 pref(layers.acceleration.enabled,false) pref(layers.force-active,true) load 919434.html
 load 926728.html
 load 930381.html
diff --git a/layout/base/moz.build b/layout/base/moz.build
index faf421f2e..51cab4c6b 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -193,11 +193,6 @@ LOCAL_INCLUDES += [
     '/view',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    LOCAL_INCLUDES += [
-        '/widget/android',
-    ]
-
 FINAL_LIBRARY = 'xul'
 
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 21068b673..45b95826c 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -3668,14 +3668,8 @@ nsCSSFrameConstructor::FindInputData(Element* aElement,
                                  nsCSSAnonBoxes::buttonContent) },
     // TODO: this is temporary until a frame is written: bug 635240.
     SIMPLE_INT_CREATE(NS_FORM_INPUT_NUMBER, NS_NewNumberControlFrame),
-#if defined(MOZ_WIDGET_ANDROID)
-    // On Android/B2G, date/time input appears as a normal text box.
-    SIMPLE_INT_CREATE(NS_FORM_INPUT_TIME, NS_NewTextControlFrame),
-    SIMPLE_INT_CREATE(NS_FORM_INPUT_DATE, NS_NewTextControlFrame),
-#else
     SIMPLE_INT_CREATE(NS_FORM_INPUT_TIME, NS_NewDateTimeControlFrame),
     SIMPLE_INT_CREATE(NS_FORM_INPUT_DATE, NS_NewDateTimeControlFrame),
-#endif
     // TODO: this is temporary until a frame is written: bug 888320
     SIMPLE_INT_CREATE(NS_FORM_INPUT_MONTH, NS_NewTextControlFrame),
     // TODO: this is temporary until a frame is written: bug 888320
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index a66a1edac..a0af38c28 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -4326,7 +4326,7 @@ nsDocumentViewer::ShouldAttachToTopLevel()
   if (nsIWidget::UsePuppetWidgets())
     return true;
 
-#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_UIKIT)
+#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_UIKIT)
   // On windows, in the parent process we also attach, but just to
   // chrome items
   nsWindowType winType = mParentWidget->WindowType();
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 5f83b9c15..cf19867ef 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -1711,10 +1711,6 @@ public:
 
   void SyncWindowProperties(nsView* aView);
 
-#ifdef ANDROID
-  virtual nsIDocument* GetTouchEventTargetDocument() = 0;
-#endif
-
 protected:
   friend class nsRefreshDriver;
 
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index f2d166470..86a11bce9 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -911,11 +911,6 @@ ApplyRectMultiplier(nsRect aRect, float aMultiplier)
 bool
 nsLayoutUtils::UsesAsyncScrolling(nsIFrame* aFrame)
 {
-#ifdef MOZ_WIDGET_ANDROID
-  // We always have async scrolling for android
-  return true;
-#endif
-
   return AsyncPanZoomEnabled(aFrame);
 }
 
@@ -8104,7 +8099,7 @@ UpdateCompositionBoundsForRCDRSF(ParentLayerRect& aCompBounds,
     return false;
   }
 
-#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_UIKIT)
+#if defined(MOZ_WIDGET_UIKIT)
   nsIWidget* widget = rootFrame->GetNearestWidget();
 #else
   nsView* view = rootFrame->GetView();
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index b1b2671c4..1fb223172 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -197,10 +197,6 @@
 #include "mozilla/StyleSheetInlines.h"
 #include "mozilla/dom/ImageTracker.h"
 
-#ifdef ANDROID
-#include "nsIDocShellTreeOwner.h"
-#endif
-
 #ifdef MOZ_TASK_TRACER
 #include "GeckoTaskTracer.h"
 using namespace mozilla::tasktracer;
@@ -7287,12 +7283,6 @@ PresShell::HandleEvent(nsIFrame* aFrame,
       // if the mouse is being captured then retarget the mouse event at the
       // document that is being captured.
       retargetEventDoc = capturingContent->GetComposedDoc();
-#ifdef ANDROID
-    } else if ((aEvent->mClass == eTouchEventClass) ||
-               (aEvent->mClass == eMouseEventClass) ||
-               (aEvent->mClass == eWheelEventClass)) {
-      retargetEventDoc = GetTouchEventTargetDocument();
-#endif
     }
 
     if (retargetEventDoc) {
@@ -7846,38 +7836,6 @@ PresShell::HandleEvent(nsIFrame* aFrame,
   return rv;
 }
 
-#ifdef ANDROID
-nsIDocument*
-PresShell::GetTouchEventTargetDocument()
-{
-  nsPresContext* context = GetPresContext();
-  if (!context || !context->IsRoot()) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsIDocShellTreeItem> shellAsTreeItem = context->GetDocShell();
-  if (!shellAsTreeItem) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsIDocShellTreeOwner> owner;
-  shellAsTreeItem->GetTreeOwner(getter_AddRefs(owner));
-  if (!owner) {
-    return nullptr;
-  }
-
-  // now get the primary content shell (active tab)
-  nsCOMPtr<nsIDocShellTreeItem> item;
-  owner->GetPrimaryContentShell(getter_AddRefs(item));
-  nsCOMPtr<nsIDocShell> childDocShell = do_QueryInterface(item);
-  if (!childDocShell) {
-    return nullptr;
-  }
-
-  return childDocShell->GetDocument();
-}
-#endif
-
 #ifdef DEBUG
 void
 PresShell::ShowEventTargetDebug()
diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h
index 80d462551..fbbcfc7ec 100644
--- a/layout/base/nsPresShell.h
+++ b/layout/base/nsPresShell.h
@@ -755,9 +755,6 @@ protected:
   virtual void SysColorChanged() override { mPresContext->SysColorChanged(); }
   virtual void ThemeChanged() override { mPresContext->ThemeChanged(); }
   virtual void BackingScaleFactorChanged() override { mPresContext->UIResolutionChanged(); }
-#ifdef ANDROID
-  virtual nsIDocument* GetTouchEventTargetDocument() override;
-#endif
 
   virtual void PausePainting() override;
   virtual void ResumePainting() override;
diff --git a/layout/base/tests/chrome/chrome.ini b/layout/base/tests/chrome/chrome.ini
index 2f6ca0ba8..56454d311 100644
--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = os == 'android'
 support-files =
   animated.gif
   blue-32x32.png
diff --git a/layout/base/tests/mochitest.ini b/layout/base/tests/mochitest.ini
index 405697977..fc616b1ef 100644
--- a/layout/base/tests/mochitest.ini
+++ b/layout/base/tests/mochitest.ini
@@ -1,6 +1,4 @@
 [DEFAULT]
-# Android: SLOW_DIRECTORY;
-skip-if = toolkit == 'android'
 support-files =
   Ahem.ttf
   border_radius_hit_testing_iframe.html
@@ -224,23 +222,18 @@ support-files = file_bug607529.html
 skip-if = e10s # bug 1020135, nested oop iframes not supported
 support-files = bug921928_event_target_iframe_apps_oop.html
 [test_mozPaintCount.html]
-skip-if = toolkit == 'android'
 [test_scroll_event_ordering.html]
 [test_scroll_selection_into_view.html]
 support-files=scroll_selection_into_view_window.html
 [test_scroll_snapping.html]
-skip-if = buildapp == 'android' # bug 1041833
 [test_scroll_snapping_scrollbars.html]
-skip-if = buildapp == 'android' # bug 1041833
 [test_bug583889.html]
 support-files = bug583889_inner1.html bug583889_inner2.html
 [test_bug582771.html]
 [test_bug968148.html]
 support-files = bug968148_inner.html
 [test_bug603550.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug629838.html]
-skip-if = toolkit == 'android'
 [test_bug646757.html]
 [test_bug718809.html]
 [test_bug725426.html]
@@ -270,13 +263,12 @@ support-files =
 
 # because of bug 469208.
 [test_bug332655-1.html]
-skip-if = toolkit == 'android'
 [test_bug332655-2.html]
 [test_bug499538-1.html]
 [test_bug749186.html]
 [test_bug644768.html]
 [test_flush_on_paint.html]
-skip-if = true || (toolkit == 'android') || (toolkit == "cocoa") # Bug 688128, bug 539356
+skip-if = true || (toolkit == "cocoa") # Bug 688128, bug 539356
 [test_getBoxQuads_convertPointRectQuad.html]
 [test_bug687297.html]
 support-files =
@@ -294,7 +286,7 @@ support-files = bug1080361_inner.html
 [test_bug1093686.html]
 support-files = bug1093686_inner.html
 [test_bug1120705.html]
-skip-if = buildapp == 'android' || os == 'mac' || toolkit == 'gtk2' || toolkit == 'gtk3' # android does not have clickable scrollbars, mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme
+skip-if = os == 'mac' || toolkit == 'gtk2' || toolkit == 'gtk3' # mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme
 [test_bug1153130.html]
 support-files = bug1153130_inner.html
 [test_bug1162990.html]
diff --git a/layout/base/tests/test_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html
index d9b5d4a6c..062c605b9 100644
--- a/layout/base/tests/test_reftests_with_caret.html
+++ b/layout/base/tests/test_reftests_with_caret.html
@@ -189,20 +189,15 @@ var tests = [
     function() {SpecialPowers.pushPrefEnv({'clear': [['layout.accessiblecaret.enabled']]}, nextTest);} ,
 ];
 
-if (navigator.appVersion.indexOf("Android") == -1 &&
-  SpecialPowers.Services.appinfo.name != "B2G") {
-  tests.push([ 'bug512295-1.html' , 'bug512295-1-ref.html' ]);
-  tests.push([ 'bug512295-2.html' , 'bug512295-2-ref.html' ]);
-  tests.push([ 'bug923376.html'   , 'bug923376-ref.html'   ]);
-  tests.push(function() {SpecialPowers.pushPrefEnv({'set': [['layout.css.overflow-clip-box.enabled', true]]}, nextTest);});
-  tests.push([ 'bug966992-1.html' , 'bug966992-1-ref.html' ]);
-  tests.push([ 'bug966992-2.html' , 'bug966992-2-ref.html' ]);
-  tests.push([ 'bug966992-3.html' , 'bug966992-3-ref.html' ]);
-  tests.push(function() {SpecialPowers.pushPrefEnv({'clear': [['layout.css.overflow-clip-box.enabled']]}, nextTest);});
-  tests.push([ 'bug1258308-1.html' , 'bug1258308-1-ref.html' ]); // maybe VK_END doesn't work on Android?
-} else {
-  is(SpecialPowers.getIntPref("layout.spellcheckDefault"), 0, "Spellcheck should be turned off for this platform or this if..else check removed");
-}
+tests.push([ 'bug512295-1.html' , 'bug512295-1-ref.html' ]);
+tests.push([ 'bug512295-2.html' , 'bug512295-2-ref.html' ]);
+tests.push([ 'bug923376.html'   , 'bug923376-ref.html'   ]);
+tests.push(function() {SpecialPowers.pushPrefEnv({'set': [['layout.css.overflow-clip-box.enabled', true]]}, nextTest);});
+tests.push([ 'bug966992-1.html' , 'bug966992-1-ref.html' ]);
+tests.push([ 'bug966992-2.html' , 'bug966992-2-ref.html' ]);
+tests.push([ 'bug966992-3.html' , 'bug966992-3-ref.html' ]);
+tests.push(function() {SpecialPowers.pushPrefEnv({'clear': [['layout.css.overflow-clip-box.enabled']]}, nextTest);});
+tests.push([ 'bug1258308-1.html' , 'bug1258308-1-ref.html' ]);
 
 if (navigator.platform.indexOf("Linux") >= 0 &&
     SpecialPowers.Services.appinfo.name != "B2G") {
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 7c9e13094..d7996af8d 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -67,11 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     LOCAL_INCLUDES += [
         '/dom/system/mac',
     ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    LOCAL_INCLUDES += [
-        '/dom/system',
-        '/dom/system/android',
-    ]
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     LOCAL_INCLUDES += [
         '/widget/gtk',
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 8a078194c..3c6f5f3aa 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -116,9 +116,6 @@ using mozilla::dom::AudioChannelAgent;
 #include "nsSystemPrincipal.h"
 #include "nsNullPrincipal.h"
 #include "nsNetCID.h"
-#if defined(MOZ_WIDGET_ANDROID)
-#include "nsHapticFeedback.h"
-#endif
 #include "nsParserUtils.h"
 
 #include "nsHTMLCanvasFrame.h"
@@ -253,9 +250,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(AudioChannelAgent)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceSensors)
 
-#if defined(ANDROID)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsHapticFeedback)
-#endif
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(ThirdPartyUtil, Init)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIPowerManagerService,
                                          PowerManagerService::GetInstance)
@@ -653,10 +647,6 @@ NS_DEFINE_NAMED_CID(NS_NULLPRINCIPAL_CID);
 NS_DEFINE_NAMED_CID(THIRDPARTYUTIL_CID);
 NS_DEFINE_NAMED_CID(NS_STRUCTUREDCLONECONTAINER_CID);
 NS_DEFINE_NAMED_CID(NS_DEVICE_SENSORS_CID);
-
-#if defined(ANDROID)
-NS_DEFINE_NAMED_CID(NS_HAPTICFEEDBACK_CID);
-#endif
 NS_DEFINE_NAMED_CID(NS_POWERMANAGERSERVICE_CID);
 NS_DEFINE_NAMED_CID(OSFILECONSTANTSSERVICE_CID);
 NS_DEFINE_NAMED_CID(UDPSOCKETCHILD_CID);
@@ -909,9 +899,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
   { &kNS_SYSTEMPRINCIPAL_CID, false, nullptr, nsSystemPrincipalConstructor },
   { &kNS_NULLPRINCIPAL_CID, false, nullptr, nsNullPrincipalConstructor },
   { &kNS_DEVICE_SENSORS_CID, false, nullptr, nsDeviceSensorsConstructor },
-#if defined(ANDROID)
-  { &kNS_HAPTICFEEDBACK_CID, false, nullptr, nsHapticFeedbackConstructor },
-#endif
   { &kTHIRDPARTYUTIL_CID, false, nullptr, ThirdPartyUtilConstructor },
   { &kNS_STRUCTUREDCLONECONTAINER_CID, false, nullptr, nsStructuredCloneContainerConstructor },
   { &kNS_POWERMANAGERSERVICE_CID, false, nullptr, nsIPowerManagerServiceConstructor, Module::ALLOW_IN_GPU_PROCESS },
@@ -1029,9 +1016,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
   { NS_SYSTEMPRINCIPAL_CONTRACTID, &kNS_SYSTEMPRINCIPAL_CID },
   { NS_NULLPRINCIPAL_CONTRACTID, &kNS_NULLPRINCIPAL_CID },
   { NS_DEVICE_SENSORS_CONTRACTID, &kNS_DEVICE_SENSORS_CID },
-#if defined(ANDROID)
-  { "@mozilla.org/widget/hapticfeedback;1", &kNS_HAPTICFEEDBACK_CID },
-#endif
   { THIRDPARTYUTIL_CONTRACTID, &kTHIRDPARTYUTIL_CID },
   { NS_STRUCTUREDCLONECONTAINER_CONTRACTID, &kNS_STRUCTUREDCLONECONTAINER_CID },
   { POWERMANAGERSERVICE_CONTRACTID, &kNS_POWERMANAGERSERVICE_CID, Module::ALLOW_IN_GPU_PROCESS },
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index d81a8dfe2..014176f03 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -315,10 +315,7 @@ nsLayoutStatics::Initialize()
   // creating the hidden DOM window to support some current stylo hacks. We
   // should move initialization back here once those go away.
 
-#ifndef MOZ_WIDGET_ANDROID
-  // On Android, we instantiate it when constructing AndroidBridge.
   MediaPrefs::GetSingleton();
-#endif
 
   return NS_OK;
 }
diff --git a/layout/forms/test/chrome.ini b/layout/forms/test/chrome.ini
index 32d862eec..87aadcdb2 100644
--- a/layout/forms/test/chrome.ini
+++ b/layout/forms/test/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = os == 'android'
 support-files =
   bug536567_iframe.html
   bug536567_subframe.html
diff --git a/layout/forms/test/mochitest.ini b/layout/forms/test/mochitest.ini
index cc8519db7..ef1632a7a 100644
--- a/layout/forms/test/mochitest.ini
+++ b/layout/forms/test/mochitest.ini
@@ -9,58 +9,44 @@ support-files =
 [test_bug345267.html]
 [test_bug346043.html]
 [test_bug348236.html]
-skip-if = toolkit == 'android' || e10s || os == 'mac' # mac(select form control popup behavior is different)
+skip-if = toolkit == e10s || os == 'mac' # mac(select form control popup behavior is different)
 [test_bug353539.html]
 [test_bug365410.html]
 [test_bug378670.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug402198.html]
 [test_bug411236.html]
 [test_bug446663.html]
-skip-if = toolkit == 'android'
 [test_bug476308.html]
 [test_bug477531.html]
 [test_bug477700.html]
 [test_bug478219.xhtml]
-skip-if = toolkit == 'android'
 [test_bug534785.html]
 [test_bug542914.html]
 [test_bug549170.html]
 [test_bug562447.html]
 [test_bug563642.html]
 [test_bug564115.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug571352.html]
-skip-if = (os == 'mac' && os_version == '10.10') || toolkit == 'android' #TIMED_OUT # OS X 10.10 - bug 947690
+skip-if = (os == 'mac' && os_version == '10.10') # OS X 10.10 - bug 947690
 [test_bug572406.html]
 [test_bug572649.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug595310.html]
 [test_bug620936.html]
 [test_bug644542.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_bug672810.html]
-skip-if = toolkit == 'android'
 [test_bug704049.html]
 [test_bug717878_input_scroll.html]
 [test_bug869314.html]
 [test_bug903715.html]
-skip-if = toolkit == 'android' || e10s #select elements don't use an in-page popup on Android
 [test_bug935876.html]
-# Bug 1023472 - Fails when pushed into a different chunk on Android
-skip-if = toolkit == 'android'
 [test_bug957562.html]
 [test_bug960277.html]
 [test_bug961363.html]
-skip-if = toolkit == 'android' # Bug 1021644 - Fails when pushed into a different chunk on Android
 [test_bug1111995.html]
 [test_bug1301290.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(resizing textarea not available in b2g) b2g-debug(resizing textarea not available in b2g) b2g-desktop(resizing textarea not available in b2g)
 [test_bug1305282.html]
 [test_listcontrol_search.html]
-skip-if = toolkit == 'android' #select elements don't use an in-page popup on Android
 [test_select_prevent_default.html]
 [test_select_vertical.html]
-skip-if = e10s || toolkit == 'android' # Bug 1170129 - vertical <select> popup not implemented for e10s # <select> elements don't use an in-page popup on Android
+skip-if = e10s # Bug 1170129 - vertical <select> popup not implemented for e10s
 [test_textarea_resize.html]
-skip-if = toolkit == 'android'
diff --git a/layout/forms/test/test_bug935876.html b/layout/forms/test/test_bug935876.html
index bb4090211..5df43e4f8 100644
--- a/layout/forms/test/test_bug935876.html
+++ b/layout/forms/test/test_bug935876.html
@@ -49,7 +49,6 @@ SimpleTest.waitForExplicitFinish();
 
 const kIsWin = navigator.platform.indexOf("Win") == 0;
 const kIsMac = navigator.platform.indexOf("Mac") == 0;
-const kIsAndroid = navigator.appVersion.indexOf("Android") != 0;
 
 function runTests()
 {
@@ -352,8 +351,7 @@ function runTests()
 
   // Mac uses native popup for dropdown.  Let's skip the tests for popup
   // since it's not handled in nsListControlFrame.
-  // Similarly, Android doesn't use popup for dropdown.
-  if (kIsMac || kIsAndroid) {
+  if (kIsMac) {
     finish();
     return;
   }
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index 72872bfde..d44d7614c 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -25,7 +25,7 @@ load 321224.xul
 load 322780-1.xul
 load 323381-1.html
 load 323381-2.html
-asserts-if(gtkWidget,1) asserts-if(Android&&asyncPan,1) asserts-if(winWidget,1) load 323386-1.html # Bug 718883
+asserts-if(gtkWidget,1) asserts-if(winWidget,1) load 323386-1.html # Bug 718883
 load 323389-1.html
 load 323389-2.html
 load 323493-1.html
@@ -310,7 +310,7 @@ load 455171-3.html
 load 455643-1.xhtml
 load 457375.html
 load 457380-1.html
-asserts-if(!Android,4) load 459968.html # bug 1067022
+asserts(4) load 459968.html # bug 1067022
 load 460910-1.xml
 load 461294-1.html
 load 462968.xhtml
@@ -345,7 +345,7 @@ load 477928.html
 load 478131-1.html
 load 478170-1.html
 load 478185-1.html
-asserts-if(!Android,0-1) load 479938-1.html # Bug 575011
+asserts(0-1) load 479938-1.html # Bug 575011
 load 480345-1.html
 load 481921.html
 load 489462-1.html
@@ -473,8 +473,8 @@ load 700031.xhtml
 load 718516.html
 load 723108.html
 load 724235.html
-skip-if(Android&&isDebugBuild) load 724978.xhtml # bug 1263300 - slow
-skip-if(Android&&isDebugBuild) load 730559.html # bug 1245634 - slow
+load 724978.xhtml
+load 730559.html
 load 734777.html
 load 737313-1.html
 load 737313-2.html
@@ -500,7 +500,7 @@ load 786740-1.html
 load 790260-1.html
 asserts(1) test-pref(font.size.inflation.emPerLine,15) load 791601.xhtml # Bug 871327
 test-pref(font.size.inflation.minTwips,120) load 794693.html
-asserts-if(!Android,4) load 798020-1.html
+asserts(4) load 798020-1.html
 load 798235-1.html
 load 799207-1.html
 load 799207-2.html
@@ -532,7 +532,7 @@ load 842166.html
 load 844529-1.html
 load 847130.xhtml
 load 847208.html
-asserts-if(Android,2) asserts-if(Android&&asyncPan,4) asserts-if(!Android,4) load 847209.html # bug 847368
+asserts(4) load 847209.html # bug 847368
 load 847211-1.html
 load 849603.html
 asserts(0-12) load 850931.html # bug 569193
@@ -558,7 +558,7 @@ asserts(2-8) load 944909-1.html
 load 946167-1.html
 load 947158.html
 load 949932.html
-asserts-if(Android,0-1) load 964078.html # bug 989718
+load 964078.html
 load 970710.html
 load 973701-1.xhtml
 load 973701-2.xhtml
@@ -626,7 +626,7 @@ load text-overflow-bug671796.xhtml
 load text-overflow-bug713610.html
 load text-overflow-form-elements.html
 load text-overflow-iframe.html
-asserts-if(Android,2-4) asserts-if(!Android,4) load 1225005.html # bug 682647 and bug 448083
+asserts(4) load 1225005.html # bug 682647 and bug 448083
 load 1233191.html
 asserts(2) load 1272983-1.html # bug 586628
 asserts(2) load 1272983-2.html # bug 586628
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index dd1b15f77..5c316b8b5 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1266,21 +1266,6 @@ ScrollFrameHelper::HandleScrollbarStyleSwitching()
   }
 }
 
-#if defined(MOZ_WIDGET_ANDROID)
-static bool IsFocused(nsIContent* aContent)
-{
-  // Some content elements, like the GetContent() of a scroll frame
-  // for a text input field, are inside anonymous subtrees, but the focus
-  // manager always reports a non-anonymous element as the focused one, so
-  // walk up the tree until we reach a non-anonymous element.
-  while (aContent && aContent->IsInAnonymousSubtree()) {
-    aContent = aContent->GetParent();
-  }
-
-  return aContent ? nsContentUtils::IsFocusedContent(aContent) : false;
-}
-#endif
-
 void
 ScrollFrameHelper::SetScrollableByAPZ(bool aScrollable)
 {
@@ -1315,12 +1300,8 @@ ScrollFrameHelper::WantAsyncScroll() const
   bool isHScrollable = (scrollRange.width >= oneDevPixel) &&
                        (styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN);
 
-#if defined(MOZ_WIDGET_ANDROID)
-  // Mobile platforms need focus to scroll.
-  bool canScrollWithoutScrollbars = IsFocused(mOuter->GetContent());
-#else
+  // Desktop platforms don't need focus to scroll.
   bool canScrollWithoutScrollbars = true;
-#endif
 
   // The check for scroll bars was added in bug 825692 to prevent layerization
   // of text inputs for performance reasons.
diff --git a/layout/generic/nsPluginFrame.cpp b/layout/generic/nsPluginFrame.cpp
index 6e9e072e7..442f8ca26 100644
--- a/layout/generic/nsPluginFrame.cpp
+++ b/layout/generic/nsPluginFrame.cpp
@@ -84,11 +84,6 @@ using mozilla::DefaultXDisplay;
 #include <winuser.h>
 #endif
 
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidBridge.h"
-#include "GLContext.h"
-#endif
-
 #include "mozilla/dom/TabChild.h"
 #include "ClientLayerManager.h"
 
@@ -938,55 +933,6 @@ nsDisplayPluginReadback::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
   return GetDisplayItemBounds(aBuilder, this, mFrame);
 }
 
-#ifdef MOZ_WIDGET_ANDROID
-
-class nsDisplayPluginVideo : public nsDisplayItem {
-public:
-  nsDisplayPluginVideo(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsNPAPIPluginInstance::VideoInfo* aVideoInfo)
-    : nsDisplayItem(aBuilder, aFrame), mVideoInfo(aVideoInfo)
-  {
-    MOZ_COUNT_CTOR(nsDisplayPluginVideo);
-  }
-#ifdef NS_BUILD_REFCNT_LOGGING
-  virtual ~nsDisplayPluginVideo() {
-    MOZ_COUNT_DTOR(nsDisplayPluginVideo);
-  }
-#endif
-
-  virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
-                           bool* aSnap) override;
-
-  NS_DISPLAY_DECL_NAME("PluginVideo", TYPE_PLUGIN_VIDEO)
-
-  virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
-                                             LayerManager* aManager,
-                                             const ContainerLayerParameters& aContainerParameters) override
-  {
-    return static_cast<nsPluginFrame*>(mFrame)->BuildLayer(aBuilder, aManager, this, aContainerParameters);
-  }
-
-  virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
-                                   LayerManager* aManager,
-                                   const ContainerLayerParameters& aParameters) override
-  {
-    return LAYER_ACTIVE;
-  }
-
-  nsNPAPIPluginInstance::VideoInfo* VideoInfo() { return mVideoInfo; }
-
-private:
-  nsNPAPIPluginInstance::VideoInfo* mVideoInfo;
-};
-
-nsRect
-nsDisplayPluginVideo::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
-{
-  *aSnap = false;
-  return GetDisplayItemBounds(aBuilder, this, mFrame);
-}
-
-#endif
-
 nsRect
 nsDisplayPlugin::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
 {
@@ -1138,9 +1084,6 @@ nsPluginFrame::IsOpaque() const
 {
 #if defined(XP_MACOSX)
   return false;
-#elif defined(MOZ_WIDGET_ANDROID)
-  // We don't know, so just assume transparent
-  return false;
 #else
 
   if (mInstanceOwner && mInstanceOwner->UseAsyncRendering()) {
@@ -1239,29 +1182,12 @@ nsPluginFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
         nsDisplayItem::ForceActiveLayers()) {
       state = LAYER_ACTIVE;
     }
-    // We don't need this on Android, and it just confuses things
-#if !MOZ_WIDGET_ANDROID
     if (aBuilder->IsPaintingToWindow() &&
         state == LAYER_ACTIVE &&
         IsTransparentMode()) {
       aLists.Content()->AppendNewToTop(new (aBuilder)
         nsDisplayPluginReadback(aBuilder, this));
     }
-#endif
-
-#if MOZ_WIDGET_ANDROID
-    if (aBuilder->IsPaintingToWindow() &&
-        state == LAYER_ACTIVE) {
-
-      nsTArray<nsNPAPIPluginInstance::VideoInfo*> videos;
-      mInstanceOwner->GetVideos(videos);
-
-      for (uint32_t i = 0; i < videos.Length(); i++) {
-        aLists.Content()->AppendNewToTop(new (aBuilder)
-          nsDisplayPluginVideo(aBuilder, this, videos[i]));
-      }
-    }
-#endif
 
     aLists.Content()->AppendNewToTop(new (aBuilder)
       nsDisplayPlugin(aBuilder, this));
@@ -1399,10 +1325,6 @@ nsPluginFrame::GetLayerState(nsDisplayListBuilder* aBuilder,
   if (!mInstanceOwner)
     return LAYER_NONE;
 
-#ifdef MOZ_WIDGET_ANDROID
-  // We always want a layer on Honeycomb and later
-  return LAYER_ACTIVE;
-#else
   if (mInstanceOwner->NeedsScrollImageLayer()) {
     return LAYER_ACTIVE;
   }
@@ -1412,7 +1334,6 @@ nsPluginFrame::GetLayerState(nsDisplayListBuilder* aBuilder,
   }
 
   return LAYER_ACTIVE_FORCE;
-#endif
 }
 
 class PluginFrameDidCompositeObserver final : public ClientLayerManager::
@@ -1529,32 +1450,6 @@ nsPluginFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
       }
       lm->AddDidCompositeObserver(mDidCompositeObserver.get());
     }
-#ifdef MOZ_WIDGET_ANDROID
-  } else if (aItem->GetType() == nsDisplayItem::TYPE_PLUGIN_VIDEO) {
-    nsDisplayPluginVideo* videoItem = reinterpret_cast<nsDisplayPluginVideo*>(aItem);
-    nsNPAPIPluginInstance::VideoInfo* videoInfo = videoItem->VideoInfo();
-
-    RefPtr<ImageContainer> container = mInstanceOwner->GetImageContainerForVideo(videoInfo);
-    if (!container)
-      return nullptr;
-
-    if (!layer) {
-      // Initialize ImageLayer
-      layer = aManager->CreateImageLayer();
-      if (!layer)
-        return nullptr;
-    }
-
-    ImageLayer* imglayer = static_cast<ImageLayer*>(layer.get());
-    imglayer->SetContainer(container);
-
-    layer->SetContentFlags(IsOpaque() ? Layer::CONTENT_OPAQUE : 0);
-
-    // Set the offset and size according to the video dimensions
-    r.MoveBy(videoInfo->mDimensions.TopLeft());
-    size.width = videoInfo->mDimensions.width;
-    size.height = videoInfo->mDimensions.height;
-#endif
   } else {
     NS_ASSERTION(aItem->GetType() == nsDisplayItem::TYPE_PLUGIN_READBACK,
                  "Unknown item type");
@@ -1603,20 +1498,7 @@ nsPluginFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
                            nsRenderingContext& aRenderingContext,
                            const nsRect& aDirtyRect, const nsRect& aPluginRect)
 {
-#if defined(MOZ_WIDGET_ANDROID)
-  if (mInstanceOwner) {
-    gfxRect frameGfxRect =
-      PresContext()->AppUnitsToGfxUnits(aPluginRect);
-    gfxRect dirtyGfxRect =
-      PresContext()->AppUnitsToGfxUnits(aDirtyRect);
-
-    gfxContext* ctx = aRenderingContext.ThebesContext();
-
-    mInstanceOwner->Paint(ctx, frameGfxRect, dirtyGfxRect);
-    return;
-  }
-#else
-# if defined(DEBUG)
+#if defined(DEBUG)
   // On Desktop, we should have built a layer as we no longer support in-process
   // plugins or synchronous painting. We can only get here for windowed plugins
   // (which draw themselves), or via some error/unload state.
@@ -1625,7 +1507,6 @@ nsPluginFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
     mInstanceOwner->GetWindow(window);
     MOZ_ASSERT(!window || window->type == NPWindowTypeWindow);
   }
-# endif
 #endif
 }
 
diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini
index 33dacddab..78d6f2b19 100644
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM, ONLY IN CHUNK 10
 support-files =
   ../../reftests/backgrounds/blue-32x32.png
   ../../reftests/backgrounds/fuchsia-32x32.png
diff --git a/layout/inspector/tests/chrome/chrome.ini b/layout/inspector/tests/chrome/chrome.ini
index ef4b74bda..d6f57343f 100644
--- a/layout/inspector/tests/chrome/chrome.ini
+++ b/layout/inspector/tests/chrome/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = os == 'android'
 support-files = GentiumPlus-R.woff
 
 [test_bug467669.css]
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 732a7dc92..d232b669b 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -1004,7 +1004,7 @@ nsPrintEngine::GetCurrentPrintSettings(nsIPrintSettings * *aCurrentPrintSettings
 nsresult
 nsPrintEngine::CheckForPrinters(nsIPrintSettings* aPrintSettings)
 {
-#if defined(XP_MACOSX) || defined(ANDROID)
+#if defined(XP_MACOSX)
   // Mac doesn't support retrieving a printer list.
   return NS_OK;
 #else
diff --git a/layout/style/crashtests/786108-2.html b/layout/style/crashtests/786108-2.html
index 1b2892040..df9fe7844 100644
--- a/layout/style/crashtests/786108-2.html
+++ b/layout/style/crashtests/786108-2.html
@@ -6,7 +6,7 @@
     // are reported from CSS embedded in a file with a long data URI. Addressed
     // by 786108; should finish quickly with that patch and run for a very long
     // time otherwise. This version is designed for slow / memory constrained
-    // platforms like Android.
+    // platforms.
 
     var img = new Array;
     img.push('<img src="data:image/svg+xml,');
diff --git a/layout/style/nsCSSPseudoElements.h b/layout/style/nsCSSPseudoElements.h
index 64eb2f00c..22c744ad0 100644
--- a/layout/style/nsCSSPseudoElements.h
+++ b/layout/style/nsCSSPseudoElements.h
@@ -115,15 +115,6 @@ public:
 
 private:
   // Does the given pseudo-element have all of the flags given?
-
-  // Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64037 ,
-  // which is a general gcc bug that we seem to have hit only on Android/x86.
-#if defined(ANDROID) && defined(__i386__) && defined(__GNUC__) && \
-    !defined(__clang__)
-#if (MOZ_GCC_VERSION_AT_MOST(4,9,2))
-   __attribute__((noinline))
-#endif
-#endif
   static bool PseudoElementHasFlags(const Type aType, uint32_t aFlags)
   {
     MOZ_ASSERT(aType < Type::Count);
diff --git a/layout/style/test/chrome/chrome.ini b/layout/style/test/chrome/chrome.ini
index dd3bdf8f5..c3e1e5130 100644
--- a/layout/style/test/chrome/chrome.ini
+++ b/layout/style/test/chrome/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = os == 'android'
 support-files =
   bug418986-2.js
   bug535806-css.css
diff --git a/layout/style/test/mochitest.ini b/layout/style/test/mochitest.ini
index 8182691ca..01aafefd9 100644
--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -41,7 +41,6 @@ support-files = additional_sheets_helper.html
 support-files = additional_sheets_helper.html
 [test_all_shorthand.html]
 [test_animations.html]
-skip-if = toolkit == 'android'
 [test_animations_async_tests.html]
 support-files = ../../reftests/fonts/Ahem.ttf file_animations_async_tests.html
 [test_animations_dynamic_changes.html]
@@ -85,7 +84,6 @@ support-files = file_animations_with_disabled_properties.html
 [test_bug373293.html]
 [test_bug377947.html]
 [test_bug379440.html]
-skip-if = toolkit == 'android'
 [test_bug379741.html]
 [test_bug382027.html]
 [test_bug383075.html]
@@ -99,7 +97,6 @@ skip-if = toolkit == 'android'
 skip-if = true # Bug 701060
 [test_bug405818.html]
 [test_bug412901.html]
-skip-if = android_version == '18' # bug 1147986
 [test_bug413958.html]
 [test_bug418986-2.html]
 [test_bug437915.html]
@@ -152,7 +149,6 @@ support-files = file_bug1089417_iframe.html
 [test_change_hint_optimizations.html]
 [test_clip-path_polygon.html]
 [test_compute_data_with_start_struct.html]
-skip-if = toolkit == 'android'
 [test_computed_style.html]
 [test_computed_style_min_size_auto.html]
 [test_computed_style_no_pseudo.html]
@@ -163,7 +159,6 @@ skip-if = toolkit == 'android'
 [test_counter_descriptor_storage.html]
 [test_counter_style.html]
 [test_css_cross_domain.html]
-skip-if = toolkit == 'android' #bug 536603
 [test_css_eof_handling.html]
 [test_css_escape_api.html]
 [test_css_function_mismatched_parenthesis.html]
@@ -205,16 +200,13 @@ support-files =
 [test_html_attribute_computed_values.html]
 [test_ident_escaping.html]
 [test_inherit_computation.html]
-skip-if = toolkit == 'android'
 [test_inherit_storage.html]
 [test_initial_computation.html]
-skip-if = toolkit == 'android'
 [test_initial_storage.html]
 [test_keyframes_rules.html]
 [test_load_events_on_stylesheets.html]
 [test_logical_properties.html]
 [test_media_queries.html]
-skip-if = android_version == '18' #debug-only failure; timed out #Android 4.3 aws only; bug 1030419
 [test_media_queries_dynamic.html]
 [test_media_queries_dynamic_xbl.html]
 [test_media_query_list.html]
@@ -245,7 +237,6 @@ support-files = redundant_font_download.sjs
 [test_rule_serialization.html]
 [test_rules_out_of_sheets.html]
 [test_selectors.html]
-skip-if = toolkit == 'android' #bug 775227
 [test_selectors_on_anonymous_content.html]
 [test_setPropertyWithNull.html]
 [test_shorthand_property_getters.html]
@@ -264,11 +255,9 @@ skip-if = toolkit == 'android' #bug 775227
 [test_transitions_computed_value_combinations.html]
 [test_transitions_events.html]
 [test_transitions.html]
-skip-if = (android_version == '18' && debug) # bug 1159532
 [test_transitions_bug537151.html]
 [test_transitions_dynamic_changes.html]
 [test_transitions_per_property.html]
-skip-if = toolkit == 'android' #bug 775227
 [test_transitions_replacement_on_busy_frame.html]
 support-files = file_transitions_replacement_on_busy_frame.html
 [test_transitions_step_functions.html]
@@ -286,9 +275,7 @@ support-files = unprefixing_service_iframe.html unprefixing_service_utils.js
 [test_unprefixing_service_prefs.html]
 support-files = unprefixing_service_iframe.html unprefixing_service_utils.js
 [test_value_cloning.html]
-skip-if = toolkit == 'android' #bug 775227
 [test_value_computation.html]
-skip-if = toolkit == 'android'
 [test_value_storage.html]
 [test_variable_serialization_computed.html]
 [test_variable_serialization_specified.html]
@@ -298,15 +285,10 @@ support-files = support/external-variable-url.css
 [test_viewport_scrollbar_causing_reflow.html]
 [test_viewport_units.html]
 [test_visited_image_loading.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_visited_image_loading_empty.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_visited_lying.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_visited_pref.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_visited_reftests.html]
-skip-if = toolkit == 'android' #TIMED_OUT
 [test_webkit_device_pixel_ratio.html]
 [test_webkit_flex_display.html]
 [test_asyncopen2.html]
diff --git a/layout/style/test/test_pseudoelement_state.html b/layout/style/test/test_pseudoelement_state.html
index ad4bf5242..bdc4dc8f2 100644
--- a/layout/style/test/test_pseudoelement_state.html
+++ b/layout/style/test/test_pseudoelement_state.html
@@ -8,8 +8,6 @@
 <iframe src="data:text/html,<!DOCTYPE html><style></style><div></div>"></iframe>
 
 <script>
-var gIsAndroid = navigator.appVersion.indexOf("Android") != -1;
-
 var gTests = [
   // Interact with the ::-moz-progress-bar.
   { markup:                 '<progress value="75" max="100"></progress>',
@@ -124,29 +122,23 @@ function runTests() {
     is(countPixelDifferences(canvas1, canvas2), 0, "hover subtest #" + aIndex + ", number of different pixels");
     is(getComputedStyle(div.firstChild, test.pseudoelement).backgroundColor, "rgb(0, 128, 0)", "hover subtest #" + aIndex + ", computed style");
 
-    if (!gIsAndroid) {
-      style.textContent = test.common_style + test.active_test_style;
-      synthesizeMouseAtCenter(div.lastChild, { type: 'mousedown' }, iframe.contentWindow);
-    }
+    style.textContent = test.common_style + test.active_test_style;
+    synthesizeMouseAtCenter(div.lastChild, { type: 'mousedown' }, iframe.contentWindow);
   }
 
   function runTestPart4(aIndex) {
-    if (!gIsAndroid) {
-      var test = gTests[aIndex];
-      canvas1 = SpecialPowers.snapshotWindow(iframe.contentWindow, false);
-      synthesizeMouseAtCenter(div.lastChild, { type: 'mouseup' }, iframe.contentWindow);
-      style.textContent = test.common_style + test.active_reference_style;
-    }
+    var test = gTests[aIndex];
+    canvas1 = SpecialPowers.snapshotWindow(iframe.contentWindow, false);
+    synthesizeMouseAtCenter(div.lastChild, { type: 'mouseup' }, iframe.contentWindow);
+    style.textContent = test.common_style + test.active_reference_style;
   }
 
   function runTestPart5(aIndex) {
-    if (!gIsAndroid) {
-      var test = gTests[aIndex];
-      canvas2 = SpecialPowers.snapshotWindow(iframe.contentWindow, false);
-      ok(canvas1.width == canvas2.width && canvas1.height == canvas2.height, "active subtest #" + aIndex + ", canvas sizes equal");
-      is(countPixelDifferences(canvas1, canvas2), 0, "active subtest #" + aIndex + ", number of different pixels");
-      is(getComputedStyle(div.firstChild, test.pseudoelement).backgroundColor, "rgb(0, 255, 0)", "active subtest #" + aIndex + ", computed style");
-    }
+    var test = gTests[aIndex];
+    canvas2 = SpecialPowers.snapshotWindow(iframe.contentWindow, false);
+    ok(canvas1.width == canvas2.width && canvas1.height == canvas2.height, "active subtest #" + aIndex + ", canvas sizes equal");
+    is(countPixelDifferences(canvas1, canvas2), 0, "active subtest #" + aIndex + ", number of different pixels");
+    is(getComputedStyle(div.firstChild, test.pseudoelement).backgroundColor, "rgb(0, 255, 0)", "active subtest #" + aIndex + ", computed style");
   }
 
   for (var i = 0; i < gTests.length; i++) {
diff --git a/layout/style/test/test_rule_insertion.html b/layout/style/test/test_rule_insertion.html
index a55ec08c5..90886973a 100644
--- a/layout/style/test/test_rule_insertion.html
+++ b/layout/style/test/test_rule_insertion.html
@@ -99,9 +99,7 @@ var innerRuleInfo = [
      if (aException) {
        return false;
      }
-     if (navigator.oscpu.match(/Linux/) ||
-         navigator.oscpu.match(/Android/) ||
-         SpecialPowers.Services.appinfo.name == "B2G") {
+     if (navigator.oscpu.match(/Linux/)) {
        return true;
     }
     return Math.abs(width - (aApplied ? monospaceWidth : serifWidth)) <= 1; // bug 769194 prevents local()
diff --git a/layout/style/test/test_value_storage.html b/layout/style/test/test_value_storage.html
index 5e7fa6b69..1ca3bd510 100644
--- a/layout/style/test/test_value_storage.html
+++ b/layout/style/test/test_value_storage.html
@@ -91,24 +91,6 @@ var gComputedStyle = window.getComputedStyle(gElement, "");
 var gPrereqDeclaration =
   document.getElementById("prereqsheet").sheet.cssRules[0].style;
 
-// On Android, avoid most 'TEST-PASS' logging by overriding
-// SimpleTest.is/isnot, to improve performance
-if (navigator.appVersion.indexOf("Android") >= 0) {
-  is = function is(a, b, name)
-  {
-    var pass = Object.is(a, b);
-    if (!pass)
-      SimpleTest.is(a, b, name);
-  }
-
-  isnot = function isnot(a, b, name)
-  {
-    var pass = !Object.is(a, b);
-    if (!pass)
-      SimpleTest.isnot(a, b, name);
-  }
-}
-
 // Returns true if propA and propB are equivalent, considering aliasing.
 // (i.e. if one is an alias of the other, or if they're both aliases of
 // the same 3rd property)
diff --git a/layout/tools/reftest/bootstrap.js b/layout/tools/reftest/bootstrap.js
index 18ca74f69..3e86a45a9 100644
--- a/layout/tools/reftest/bootstrap.js
+++ b/layout/tools/reftest/bootstrap.js
@@ -33,12 +33,6 @@ var WindowListener = {
 };
 
 function startup(data, reason) {
-  if (Services.appinfo.OS == "Android") {
-    Cm.addBootstrappedManifestLocation(data.installPath);
-    Services.wm.addListener(WindowListener);
-    return;
-  }
-
   let orig = Services.wm.getMostRecentWindow("navigator:browser");
 
   let ios = Cc["@mozilla.org/network/io-service;1"]
@@ -61,12 +55,7 @@ function startup(data, reason) {
 }
 
 function shutdown(data, reason) {
-  if (Services.appinfo.OS == "Android") {
-    Services.wm.removeListener(WindowListener);
-    Cm.removedBootstrappedManifestLocation(data.installPath);
-    OnRefTestUnload();
-    Cu.unload("chrome://reftest/content/reftest.jsm");
-  }
+  // Any special shutdown commands go here.
 }
 
 
diff --git a/layout/tools/reftest/mach_commands.py b/layout/tools/reftest/mach_commands.py
index e790486ef..a85181f9a 100644
--- a/layout/tools/reftest/mach_commands.py
+++ b/layout/tools/reftest/mach_commands.py
@@ -208,80 +208,6 @@ class ReftestRunner(MozbuildObject):
 
         return rv
 
-    def run_android_test(self, **kwargs):
-        """Runs a reftest, in Firefox for Android."""
-
-        args = Namespace(**kwargs)
-        if args.suite not in ('reftest', 'crashtest', 'jstestbrowser'):
-            raise Exception('None or unrecognized reftest suite type.')
-
-        self._setup_objdir(args)
-        import remotereftest
-
-        default_manifest = {
-            "reftest": (self.topsrcdir, "layout", "reftests", "reftest.list"),
-            "crashtest": (self.topsrcdir, "testing", "crashtest", "crashtests.list"),
-            "jstestbrowser": ("jsreftest", "tests", "jstests.list")
-        }
-
-        if not args.tests:
-            args.tests = [os.path.join(*default_manifest[args.suite])]
-
-        args.extraProfileFiles.append(
-            os.path.join(self.topsrcdir, "mobile", "android", "fonts"))
-
-        hyphenation_path = os.path.join(self.topsrcdir, "intl", "locales")
-
-        for (dirpath, dirnames, filenames) in os.walk(hyphenation_path):
-            for filename in filenames:
-                if filename.endswith('.dic'):
-                    args.extraProfileFiles.append(os.path.join(dirpath, filename))
-
-        if not args.httpdPath:
-            args.httpdPath = os.path.join(self.tests_dir, "modules")
-        if not args.symbolsPath:
-            args.symbolsPath = os.path.join(self.topobjdir, "crashreporter-symbols")
-        if not args.xrePath:
-            args.xrePath = os.environ.get("MOZ_HOST_BIN")
-        if not args.app:
-            args.app = self.substs["ANDROID_PACKAGE_NAME"]
-        if not args.utilityPath:
-            args.utilityPath = args.xrePath
-        args.dm_trans = "adb"
-        args.ignoreWindowSize = True
-        args.printDeviceInfo = False
-
-        from mozrunner.devices.android_device import grant_runtime_permissions
-        grant_runtime_permissions(self)
-
-        # A symlink and some path manipulations are required so that test
-        # manifests can be found both locally and remotely (via a url)
-        # using the same relative path.
-        if args.suite == "jstestbrowser":
-            staged_js_dir = os.path.join(self.topobjdir, "dist", "test-stage", "jsreftest")
-            tests = os.path.join(self.reftest_dir, 'jsreftest')
-            if not os.path.isdir(tests):
-                os.symlink(staged_js_dir, tests)
-            args.extraProfileFiles.append(os.path.join(staged_js_dir, "tests", "user.js"))
-        else:
-            tests = os.path.join(self.reftest_dir, "tests")
-            if not os.path.isdir(tests):
-                os.symlink(self.topsrcdir, tests)
-            for i, path in enumerate(args.tests):
-                # Non-absolute paths are relative to the packaged directory, which
-                # has an extra tests/ at the start
-                if os.path.exists(os.path.abspath(path)):
-                    path = os.path.relpath(path, os.path.join(self.topsrcdir))
-                args.tests[i] = os.path.join('tests', path)
-
-        self.log_manager.enable_unstructured()
-        try:
-            rv = remotereftest.run_test_harness(parser, args)
-        finally:
-            self.log_manager.disable_unstructured()
-
-        return rv
-
 
 def process_test_objects(kwargs):
     """|mach test| works by providing a test_objects argument, from
@@ -299,12 +225,7 @@ def get_parser():
     global parser
     here = os.path.abspath(os.path.dirname(__file__))
     build_obj = MozbuildObject.from_environment(cwd=here)
-    if conditions.is_android(build_obj):
-        parser = reftestcommandline.RemoteArgumentsParser()
-    elif conditions.is_mulet(build_obj):
-        parser = reftestcommandline.B2GArgumentParser()
-    else:
-        parser = reftestcommandline.DesktopArgumentsParser()
+    parser = reftestcommandline.DesktopArgumentsParser()
     return parser
 
 
@@ -340,12 +261,6 @@ class MachCommands(MachCommandBase):
     def _run_reftest(self, **kwargs):
         process_test_objects(kwargs)
         reftest = self._spawn(ReftestRunner)
-        if conditions.is_android(self):
-            from mozrunner.devices.android_device import verify_android_device
-            verify_android_device(self, install=True, xre=True)
-            return reftest.run_android_test(**kwargs)
-        elif conditions.is_mulet(self):
-            return reftest.run_mulet_test(**kwargs)
         return reftest.run_desktop_test(**kwargs)
 
 
diff --git a/layout/tools/reftest/mach_test_package_commands.py b/layout/tools/reftest/mach_test_package_commands.py
index e3bf64cb8..197800cf2 100644
--- a/layout/tools/reftest/mach_test_package_commands.py
+++ b/layout/tools/reftest/mach_test_package_commands.py
@@ -29,8 +29,6 @@ def run_reftest(context, **kwargs):
     normalize = partial(context.normalize_test_path, test_root)
     args.tests = map(normalize, args.tests)
 
-    if mozinfo.info.get('buildapp') == 'mobile/android':
-        return run_reftest_android(context, args)
     return run_reftest_desktop(context, args)
 
 
@@ -44,37 +42,13 @@ def run_reftest_desktop(context, args):
     return run_test_harness(parser, args)
 
 
-def run_reftest_android(context, args):
-    from remotereftest import run_test_harness
-
-    args.app = args.app or 'org.mozilla.fennec'
-    args.utilityPath = context.hostutils
-    args.xrePath = context.hostutils
-    args.httpdPath = context.module_dir
-    args.dm_trans = 'adb'
-    args.ignoreWindowSize = True
-    args.printDeviceInfo = False
-
-    config = context.mozharness_config
-    if config:
-        args.remoteWebServer = config['remote_webserver']
-        args.httpPort = config['emulator']['http_port']
-        args.sslPort = config['emulator']['ssl_port']
-        args.adb_path = config['exes']['adb'] % {'abs_work_dir': context.mozharness_workdir}
-
-    return run_test_harness(parser, args)
-
-
 def setup_argument_parser():
     import mozinfo
     import reftestcommandline
 
     global parser
     mozinfo.find_and_update_from_json(here)
-    if mozinfo.info.get('buildapp') == 'mobile/android':
-        parser = reftestcommandline.RemoteArgumentsParser()
-    else:
-        parser = reftestcommandline.DesktopArgumentsParser()
+    parser = reftestcommandline.DesktopArgumentsParser()
     return parser
 
 
diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm
index 5ee1b7105..cd2e02f27 100644
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -302,16 +302,7 @@ this.OnRefTestLoad = function OnRefTestLoad(win)
     // what size our window is
     gBrowser.setAttribute("style", "padding: 0px; margin: 0px; border:none; min-width: 800px; min-height: 1000px; max-width: 800px; max-height: 1000px");
 
-    if (Services.appinfo.OS == "Android") {
-      let doc;
-      doc = gContainingWindow.document.getElementById('main-window');
-      while (doc.hasChildNodes()) {
-        doc.removeChild(doc.firstChild);
-      }
-      doc.appendChild(gBrowser);
-    } else {
-      document.getElementById("reftest-window").appendChild(gBrowser);
-    }
+    document.getElementById("reftest-window").appendChild(gBrowser);
 
     // reftests should have the test plugins enabled, not click-to-play
     let plugin1 = getTestPlugin("Test Plug-in");
@@ -341,10 +332,6 @@ function InitAndStartRefTests()
         logger.error("EXCEPTION: " + e);
     }
 
-    try {
-      prefs.setBoolPref("android.widget_paints_background", false);
-    } catch (e) {}
-
     /* set the gLoadTimeout */
     gLoadTimeout = prefs.getIntPref("reftest.timeout", 5 * 60 * 1000); //5 minutes as per bug 479518
 
@@ -620,7 +607,7 @@ function BuildConditionSandbox(aURL) {
 
     // Shortcuts for widget toolkits.
     sandbox.B2G = false;
-    sandbox.Android = xr.OS == "Android" && !sandbox.B2G;
+    sandbox.Android = false;
     sandbox.cocoaWidget = xr.widgetToolkit == "cocoa";
     sandbox.gtkWidget = xr.widgetToolkit == "gtk2"
                         || xr.widgetToolkit == "gtk3";
@@ -630,14 +617,6 @@ function BuildConditionSandbox(aURL) {
     // Scrollbars that are semi-transparent. See bug 1169666.
     sandbox.transparentScrollbars = xr.widgetToolkit == "gtk3";
 
-    if (sandbox.Android) {
-        var sysInfo = CC["@mozilla.org/system-info;1"].getService(CI.nsIPropertyBag2);
-
-        // This is currently used to distinguish Android 4.0.3 (SDK version 15)
-        // and later from Android 2.x
-        sandbox.AndroidVersion = sysInfo.getPropertyAsInt32("version");
-    }
-
 #if MOZ_ASAN
     sandbox.AddressSanitizer = true;
 #else
diff --git a/layout/tools/reftest/reftestcommandline.py b/layout/tools/reftest/reftestcommandline.py
index f983be528..40bd8a5ee 100644
--- a/layout/tools/reftest/reftestcommandline.py
+++ b/layout/tools/reftest/reftestcommandline.py
@@ -352,8 +352,7 @@ class DesktopArgumentsParser(ReftestArgumentsParser):
 
         if options.app is None:
             bin_dir = (self.build_obj.get_binary_path() if
-                       self.build_obj and self.build_obj.substs[
-                           'MOZ_BUILD_APP'] != 'mobile/android'
+                       self.build_obj
                        else None)
 
             if bin_dir:
@@ -744,7 +743,5 @@ class RemoteArgumentsParser(ReftestArgumentsParser):
                 self.error("ERROR: Invalid screen resolution %sx%s, please adjust to 1366x1050 or higher" % (
                     width, height))
 
-        # Disable e10s by default on Android because we don't run Android
-        # e10s jobs anywhere yet.
         options.e10s = False
         return options
diff --git a/layout/xul/crashtests/crashtests.list b/layout/xul/crashtests/crashtests.list
index 4ee6654c6..ad7c84770 100644
--- a/layout/xul/crashtests/crashtests.list
+++ b/layout/xul/crashtests/crashtests.list
@@ -32,7 +32,7 @@ load 360642-1.xul
 load 365151.xul
 load 366112-1.xul
 asserts(0-50) load 366203-1.xul # bug 1217984
-asserts(24) asserts-if(Android&&!asyncPan,9) load 367185-1.xhtml # bug 1220345
+asserts(24) load 367185-1.xhtml # bug 1220345
 load 369942-1.xhtml
 load 374102-1.xul
 load 376137-1.html
@@ -77,7 +77,7 @@ load 434458-1.xul
 load 452185.html
 load 460900-1.xul
 load 464149-1.xul
-asserts-if(winWidget,1) asserts-if(Android,0-1) load 464407-1.xhtml # Bug 450974 on win, Bug 1267054 on Android
+asserts-if(winWidget,1) load 464407-1.xhtml # Bug 450974
 load 467080.xul
 load 467481-1.xul
 load 470063-1.html
diff --git a/layout/xul/reftest/reftest.list b/layout/xul/reftest/reftest.list
index 39f353577..4f927b5d0 100644
--- a/layout/xul/reftest/reftest.list
+++ b/layout/xul/reftest/reftest.list
@@ -1,6 +1,6 @@
-fails-if(Android) == textbox-multiline-noresize.xul textbox-multiline-ref.xul # reference is blank on Android (due to no native theme support?)
+== textbox-multiline-noresize.xul textbox-multiline-ref.xul
 != textbox-multiline-resize.xul textbox-multiline-ref.xul
 == popup-explicit-size.xul popup-explicit-size-ref.xul
-random-if(Android) == image-size.xul image-size-ref.xul
+== image-size.xul image-size-ref.xul
 == image-scaling-min-height-1.xul image-scaling-min-height-1-ref.xul
 == textbox-text-transform.xul textbox-text-transform-ref.xul
diff --git a/layout/xul/test/chrome.ini b/layout/xul/test/chrome.ini
index 2a647b6b7..44224dca8 100644
--- a/layout/xul/test/chrome.ini
+++ b/layout/xul/test/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = os == 'android'
 support-files =
   window_resizer.xul
   window_resizer_element.xul
diff --git a/layout/xul/test/mochitest.ini b/layout/xul/test/mochitest.ini
index 540abc730..e48262ab0 100644
--- a/layout/xul/test/mochitest.ini
+++ b/layout/xul/test/mochitest.ini
@@ -3,10 +3,7 @@
 [test_bug386386.html]
 [test_bug394800.xhtml]
 [test_bug511075.html]
-skip-if = toolkit == 'android' #bug 798806
 [test_bug563416.html]
 [test_bug1197913.xul]
-skip-if = toolkit == 'android'
 [test_resizer_incontent.xul]
 [test_splitter.xul]
-skip-if = toolkit == 'android' # no XUL theme