From 69ed4e4b4ee94b69f55e2e0d405aff109e3d145c Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 22 Feb 2020 19:03:00 -0500
Subject: Issue #1053 - Remove android support from XPCOM

---
 xpcom/tests/gtest/TestTArray2.cpp | 3 ---
 xpcom/tests/gtest/moz.build       | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'xpcom/tests/gtest')

diff --git a/xpcom/tests/gtest/TestTArray2.cpp b/xpcom/tests/gtest/TestTArray2.cpp
index 421927104..c932b8faa 100644
--- a/xpcom/tests/gtest/TestTArray2.cpp
+++ b/xpcom/tests/gtest/TestTArray2.cpp
@@ -871,8 +871,6 @@ TEST(TArray, test_swap) {
   }
 }
 
-// Bug 1171296: Disabled on andoid due to crashes.
-#if !defined(ANDROID)
 TEST(TArray, test_fallible)
 {
   // Test that FallibleTArray works properly; that is, it never OOMs, but
@@ -909,7 +907,6 @@ TEST(TArray, test_fallible)
   ASSERT_TRUE(oomed) << "Didn't OOM or crash?  nsTArray::SetCapacity"
                         "must be lying.";
 }
-#endif
 
 TEST(TArray, test_conversion_operator) {
   FallibleTArray<int> f;
diff --git a/xpcom/tests/gtest/moz.build b/xpcom/tests/gtest/moz.build
index ac98c2217..4ed242d03 100644
--- a/xpcom/tests/gtest/moz.build
+++ b/xpcom/tests/gtest/moz.build
@@ -48,9 +48,8 @@ UNIFIED_SOURCES += [
     'TestXPIDLString.cpp',
 ]
 
-if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT') and CONFIG['OS_TARGET'] != 'Android':
+if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT'):
     # FIXME bug 523392: TestDeadlockDetector doesn't like Windows
-    # Bug 1054249: Doesn't work on Android
     UNIFIED_SOURCES += [
         'TestDeadlockDetector.cpp',
         'TestDeadlockDetectorScalability.cpp',
-- 
cgit v1.2.3