Merge bug 774424 to production

--HG-- branch : production-0.8
mozilla-releng · Aug 27, 2012 · 8742c50 · 8742c50
2 parents cbd233b + 71935b4
commit 8742c50
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/process/factory.py b/process/factory.py
@@ -258,9 +258,7 @@ def getPlatformMinidumpPath(platform):
         'macosx64': WithProperties('%(toolsdir:-)s/breakpad/osx64/minidump_stackwalk'),
         'macosx64_gecko': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
         # Android uses OSX because the Foopies are OSX.
-        'linux-android': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
         'android': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
-        'android-xul': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
         # Pandas will run on Linux Foopies.
         'android-armv6': WithProperties('%(toolsdir:-)s/breakpad/linux/minidump_stackwalk'),
         }

diff --git a/try_parser.py b/try_parser.py
@@ -162,8 +162,6 @@ def TryParser(message, builderNames, prettyNames, unittestPrettyNames=None, unit
         # ugly
         user_platforms = []
         for user_platform in options.user_platforms.split(','):
-            if user_platform in ('android-r7', 'linux-android'):
-                user_platform = 'android'
             user_platforms.append(user_platform)
         options.user_platforms = user_platforms