Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge bug 774424 to production

--HG--
branch : production-0.8
  • Loading branch information...
commit 8742c50cb0f1a10ee05d8d6878489250b3df9533 2 parents cbd233b + 71935b4
authored August 27, 2012
2  process/factory.py
@@ -258,9 +258,7 @@ def getPlatformMinidumpPath(platform):
258 258
         'macosx64': WithProperties('%(toolsdir:-)s/breakpad/osx64/minidump_stackwalk'),
259 259
         'macosx64_gecko': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
260 260
         # Android uses OSX because the Foopies are OSX.
261  
-        'linux-android': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
262 261
         'android': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
263  
-        'android-xul': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
264 262
         # Pandas will run on Linux Foopies.
265 263
         'android-armv6': WithProperties('%(toolsdir:-)s/breakpad/linux/minidump_stackwalk'),
266 264
         }
2  try_parser.py
@@ -162,8 +162,6 @@ def TryParser(message, builderNames, prettyNames, unittestPrettyNames=None, unit
162 162
         # ugly
163 163
         user_platforms = []
164 164
         for user_platform in options.user_platforms.split(','):
165  
-            if user_platform in ('android-r7', 'linux-android'):
166  
-                user_platform = 'android'
167 165
             user_platforms.append(user_platform)
168 166
         options.user_platforms = user_platforms
169 167
 

0 notes on commit 8742c50

Please sign in to comment.
Something went wrong with that request. Please try again.