From 96a23f8affdc30510c3195b7ae61b6dadf2ab16b Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted@mielczarek.org>
Date: Mon, 11 Aug 2014 07:46:46 -0400
Subject: [PATCH] bug 1049202 - remove automationutils mozinfo workaround for
 non-mozharness Android tests. r=jmaher

---
 build/automationutils.py | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/build/automationutils.py b/build/automationutils.py
index b8cbf5eca4e..98c0f3e9293 100644
--- a/build/automationutils.py
+++ b/build/automationutils.py
@@ -15,28 +15,7 @@ import sys
 import tempfile
 from urlparse import urlparse
 import zipfile
-
-try:
-  import mozinfo
-except ImportError:
-  # Stub out fake mozinfo since this is not importable on Android 4.0 Opt.
-  # This should be fixed; see
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=650881
-  mozinfo = type('mozinfo', (), dict(info={}))()
-  mozinfo.isWin = mozinfo.isLinux = mozinfo.isUnix = mozinfo.isMac = False
-
-  # TODO! FILE: localautomation :/
-  # mapping from would-be mozinfo attr <-> sys.platform
-  mapping = {'isMac': ['mac', 'darwin'],
-             'isLinux': ['linux', 'linux2'],
-             'isWin': ['win32', 'win64'],
-             }
-  mapping = dict(sum([[(value, key) for value in values] for key, values in mapping.items()], []))
-  attr = mapping.get(sys.platform)
-  if attr:
-    setattr(mozinfo, attr, True)
-  if mozinfo.isLinux:
-    mozinfo.isUnix = True
+import mozinfo
 
 __all__ = [
   "ZipFileReader",