From f4e514de66bc88423b42ccbde1b7f25a5d46b2d9 Mon Sep 17 00:00:00 2001 From: treib Date: Fri, 6 Mar 2015 07:25:31 -0800 Subject: 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} --- tools/isolate_driver.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tools/isolate_driver.py') 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('(?