Chromium Code Reviews| Index: tools/isolate_driver.py |
| diff --git a/tools/isolate_driver.py b/tools/isolate_driver.py |
| index 6c9f11886633c1343297e885204e50cbb3560fa2..b81ca914a90ca43f59d7dbcb3750dd304f1ecb30 100755 |
| --- a/tools/isolate_driver.py |
| +++ b/tools/isolate_driver.py |
| @@ -24,6 +24,7 @@ import json |
| import logging |
| import os |
| import posixpath |
| +import re |
| import StringIO |
| import subprocess |
| import sys |
| @@ -141,7 +142,9 @@ def raw_build_to_deps(item): |
| # TODO(maruel): Use a whitelist instead? .stamp, .so.TOC, .dylib.TOC, |
| # .dll.lib, .exe and empty. |
| # The first item is the build rule, e.g. 'link', 'cxx', 'phony', etc. |
| - return filter(using_blacklist, item.split(' ')[1:]) |
| + # In ninja build files, spaces in targets are escaped with a $-prefix. |
| + # Use a negative lookbehind to not split on a space that is following a $. |
|
M-A Ruel
2015/05/04 13:39:52
.. to not split on '$ '.
would be easier to read b
nyquist
2015/05/04 18:43:05
Done.
|
| + return filter(using_blacklist, re.split('(?<!\$) ', item)[1:]) |
| def collect_deps(target, build_steps, dependencies_added, rules_seen): |