diff options
| author | treib <treib@chromium.org> | 2015-03-06 07:25:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-06 15:26:25 +0000 |
| commit | f4e514de66bc88423b42ccbde1b7f25a5d46b2d9 (patch) | |
| tree | c5ad223374c983c9f3ddb8909166f256e1fdb495 /tools/isolate_driver.py | |
| parent | 23833a3b27be4c218135a111b8427047509eca5f (diff) | |
| download | chromium_src-f4e514de66bc88423b42ccbde1b7f25a5d46b2d9.zip chromium_src-f4e514de66bc88423b42ccbde1b7f25a5d46b2d9.tar.gz chromium_src-f4e514de66bc88423b42ccbde1b7f25a5d46b2d9.tar.bz2 | |
Revert of Add support for escaped target names in isolate driver. (patchset #6 id:100001 of https://codereview.chromium.org/970203003/)
Reason for revert:
Likely broke Mac 10.9 dbg: http://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests%20%28dbg%29/builds/3709
Original issue's description:
> Add support for escaped target names in isolate driver.
>
> Currently the isolate_driver.py which creates the dependency files
> used by the isolate system, does a simple split on all spaces when
> trying to identify targets.
>
> This can fail if the target name contains a space in the name. In
> ninja, spaces are escaped with a $-prefix. An example would be
> 'Content$ Shell$ Helper.app'.
>
> This CL adds support for such target names and ensures that they
> stay as one item.
>
> BUG=462248
>
> Committed: https://crrev.com/8fb598c1b7b9a6b944e2ec15e989e80cdf7522c0
> Cr-Commit-Position: refs/heads/master@{#319356}
TBR=avi@chromium.org,maruel@chromium.org,falken@chromium.org,vadimsh@chromium.org,nyquist@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=462248
Review URL: https://codereview.chromium.org/985753002
Cr-Commit-Position: refs/heads/master@{#319448}
Diffstat (limited to 'tools/isolate_driver.py')
| -rwxr-xr-x | tools/isolate_driver.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/isolate_driver.py b/tools/isolate_driver.py index b81ca91..6c9f118 100755 --- a/tools/isolate_driver.py +++ b/tools/isolate_driver.py @@ -24,7 +24,6 @@ import json import logging import os import posixpath -import re import StringIO import subprocess import sys @@ -142,9 +141,7 @@ 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. - # 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 $. - return filter(using_blacklist, re.split('(?<!\$) ', item)[1:]) + return filter(using_blacklist, item.split(' ')[1:]) def collect_deps(target, build_steps, dependencies_added, rules_seen): |