diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 20:26:01 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 20:26:01 +0000 |
| commit | c58866ed32ca85f93cd3bef97a690c256ef6ef99 (patch) | |
| tree | 31fe15a18179989d1ecbd5d97e2c3ae9c56a353a /tools/isolate/merge_isolate.py | |
| parent | 7eae44cfa73fb5aaf788c9e506fd82cb4020ef3c (diff) | |
| download | chromium_src-c58866ed32ca85f93cd3bef97a690c256ef6ef99.zip chromium_src-c58866ed32ca85f93cd3bef97a690c256ef6ef99.tar.gz chromium_src-c58866ed32ca85f93cd3bef97a690c256ef6ef99.tar.bz2 | |
isolate.py: Automatically create --outdir in --mode run
merge_isolate.py: Allow loading files with CRLF EOL.
R=rogerta@chromium.org
BUG=98834
TEST=
Review URL: http://codereview.chromium.org/10024080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/isolate/merge_isolate.py')
| -rwxr-xr-x | tools/isolate/merge_isolate.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/isolate/merge_isolate.py b/tools/isolate/merge_isolate.py index 07eb8676..df6f92b 100755 --- a/tools/isolate/merge_isolate.py +++ b/tools/isolate/merge_isolate.py @@ -359,7 +359,7 @@ def load_gyps(items): configs = Configs([]) for item in items: logging.debug('loading %s' % item) - new_config = load_gyp(eval_content(open(item, 'rb').read())) + new_config = load_gyp(eval_content(open(item, 'r').read())) logging.debug('has OSes: %s' % ','.join(k for k in new_config.per_os if k)) configs = union(configs, new_config) logging.debug('Total OSes: %s' % ','.join(k for k in configs.per_os if k)) |