summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 23:36:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 23:36:53 +0000
commit1c0f34e2613ea5af8be7cf5618aee4e854463c1d (patch)
tree4d82bdca7c16b95ecd28ddc8a017fb0cc4a31931
parent14c706fa846a7b04025a3216b66942f94067c30c (diff)
downloadchromium_src-1c0f34e2613ea5af8be7cf5618aee4e854463c1d.zip
chromium_src-1c0f34e2613ea5af8be7cf5618aee4e854463c1d.tar.gz
chromium_src-1c0f34e2613ea5af8be7cf5618aee4e854463c1d.tar.bz2
Fix crash during build/gyp_chromium time.
Without GYP_DEFINES set, build/gyp_chromium would crash with Generating gyp files from GN... Traceback (most recent call last): File "./build/gyp_chromium", line 207, in <module> if not RunGN(supplemental_includes): File "./build/gyp_chromium", line 147, in RunGN gyp_vars = GetVarsStringForGN(supplemental_includes) File "./build/gyp_chromium", line 79, in GetVarsStringForGN items = shlex.split(env_string) File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/shlex.py", line 279, in split return list(lex) File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/shlex.py", line 269, in next token = self.get_token() File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/shlex.py", line 96, in get_token raw = self.read_token() File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/shlex.py", line 124, in read_token nextchar = self.instream.read(1) AttributeError: 'list' object has no attribute 'read' This was broken by r238475 BUG=321352 Review URL: https://codereview.chromium.org/103253002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238486 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xbuild/gyp_chromium2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 7180edb..85dd4a3 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -75,7 +75,7 @@ def GetVarsStringForGN(supplemental_files):
for v in variables:
vars_dict[v] = '"' + variables[v] + '"'
- env_string = os.environ.get('GYP_DEFINES', [])
+ env_string = os.environ.get('GYP_DEFINES', '')
items = shlex.split(env_string)
for item in items:
tokens = item.split('=', 1)