Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge bug 774424 to production

--HG--
branch : production-0.8
  • Loading branch information...
commit 8742c50cb0f1a10ee05d8d6878489250b3df9533 2 parents cbd233b + 71935b4
@bhearsum bhearsum authored
Showing with 0 additions and 4 deletions.
  1. +0 −2  process/factory.py
  2. +0 −2  try_parser.py
View
2  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'),
}
View
2  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

0 comments on commit 8742c50

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