7 files changed, 13 insertions, 69 deletions
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)