Commit 1c0f34e2 authored by thakis@chromium.org's avatar thakis@chromium.org

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
parent 14c706fa
...@@ -75,7 +75,7 @@ def GetVarsStringForGN(supplemental_files): ...@@ -75,7 +75,7 @@ def GetVarsStringForGN(supplemental_files):
for v in variables: for v in variables:
vars_dict[v] = '"' + variables[v] + '"' vars_dict[v] = '"' + variables[v] + '"'
env_string = os.environ.get('GYP_DEFINES', []) env_string = os.environ.get('GYP_DEFINES', '')
items = shlex.split(env_string) items = shlex.split(env_string)
for item in items: for item in items:
tokens = item.split('=', 1) tokens = item.split('=', 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment