From 496fbaf738fb00824d7e972e874bfdbe85caaee5 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 20 Feb 2020 12:12:30 -0500
Subject: Issue #1053 - Remove conditional android code from widget/
---
widget/GfxInfoBase.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'widget/GfxInfoBase.cpp')
diff --git a/widget/GfxInfoBase.cpp b/widget/GfxInfoBase.cpp
index e20de8277..4c2d83018 100644
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -274,8 +274,6 @@ BlacklistOSToOperatingSystem(const nsAString& os)
return OperatingSystem::OSX10_11;
else if (os.EqualsLiteral("Darwin 16"))
return OperatingSystem::OSX10_12;
- else if (os.EqualsLiteral("Android"))
- return OperatingSystem::Android;
// For historical reasons, "All" in blocklist means "All Windows"
else if (os.EqualsLiteral("All"))
return OperatingSystem::Windows;
@@ -691,7 +689,7 @@ GfxInfoBase::FindBlocklistedDeviceInList(const nsTArray<GfxDriverInfo>& info,
}
}
-#if defined(XP_WIN) || defined(ANDROID)
+#ifdef XP_WIN
uint64_t driverVersion;
ParseDriverVersion(adapterDriverVersionString, &driverVersion);
#endif
@@ -730,7 +728,7 @@ GfxInfoBase::FindBlocklistedDeviceInList(const nsTArray<GfxDriverInfo>& info,
continue;
}
-#if defined(XP_WIN) || defined(ANDROID)
+#ifdef XP_WIN
switch (info[i].mComparisonOp) {
case DRIVER_LESS_THAN:
match = driverVersion < info[i].mDriverVersion;
--
cgit v1.2.3