diff options
author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
---|---|---|
committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /build/build-bisect.py | |
parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'build/build-bisect.py')
-rwxr-xr-x | build/build-bisect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build-bisect.py b/build/build-bisect.py index 64504bc..f44846a 100755 --- a/build/build-bisect.py +++ b/build/build-bisect.py @@ -97,7 +97,7 @@ def SetArchiveVars(archive): BUILD_ARCHIVE_TYPE = archive BUILD_ARCHIVE_DIR = 'chromium-rel-' + BUILD_ARCHIVE_TYPE - if BUILD_ARCHIVE_TYPE in ('linux', 'linux-64'): + if BUILD_ARCHIVE_TYPE in ('linux', 'linux-64', 'linux-chromiumos'): BUILD_ZIP_NAME = 'chrome-linux.zip' BUILD_DIR_NAME = 'chrome-linux' BUILD_EXE_NAME = 'chrome' @@ -178,7 +178,7 @@ def main(): 'Perform binary search on the snapshot builds.') parser = optparse.OptionParser(usage=usage) # Strangely, the default help output doesn't include the choice list. - choices = ['mac', 'xp', 'linux', 'linux-64'] + choices = ['mac', 'xp', 'linux', 'linux-64', 'linux-chromiumos'] parser.add_option('-a', '--archive', choices = choices, help = 'The buildbot archive to bisect [%s].' % |