Add support for escaped target names in isolate driver.

tools/isolate_driver.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Adaptor script called through build/isolate.gypi.
 
 Creates a wrapping .isolate which 'includes' the original one, that can be
 consumed by tools/swarming_client/isolate.py. Path variables are determined
 based on the current working directory. The relative_cwd in the .isolated file
@@ skipping 10 matching lines @@
 
 import glob
 import json
 import logging
 import os
 import posixpath
 import StringIO
 import subprocess
 import sys
 import time
+import uuid
 
 TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
 SWARMING_CLIENT_DIR = os.path.join(TOOLS_DIR, 'swarming_client')
 SRC_DIR = os.path.dirname(TOOLS_DIR)
 
 sys.path.insert(0, SWARMING_CLIENT_DIR)
 
 import isolate_format
 
 
@@ skipping 93 matching lines @@
   return item not in ('', '|', '||')
 
 
 def raw_build_to_deps(item):
   """Converts a raw ninja build statement into the list of interesting
   dependencies.
   """
   # 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.
+  # Create a random UUID to use as a replacement for '$ ' and use it while
+  # splitting the item variable on ' '. When the split has been done, iterate
+  # over all items, and replace the random variable back to the original.
+  rand = str(uuid.uuid4())

[Avi (use Gerrit), 2015/03/03 20:20:30]

Rather than uuids, can you pick something simple that will never be a normal
part of a name? I'm thinking a unicode character or something. All you need is
something that won't be used as a name, and uuids seem like overkill.

[nyquist, 2015/03/04 02:06:22]

Done.

+  items_no_space = item.replace('$ ', rand).split(' ')[1:]
+  items = [it.replace(rand, '$ ') for it in items_no_space]
+
+  return filter(using_blacklist, items)
 
 
 def collect_deps(target, build_steps, dependencies_added, rules_seen):
   """Recursively adds all the interesting dependencies for |target|
   into |dependencies_added|.
   """
   if rules_seen is None:
     rules_seen = set()
   if target in rules_seen:
     # TODO(maruel): Figure out how it happens.
@@ skipping 148 matching lines @@
 
   swarming_client = os.path.join(SRC_DIR, 'tools', 'swarming_client')
   sys.stdout.flush()
   result = subprocess.call(
       [sys.executable, os.path.join(swarming_client, 'isolate.py')] + args)
   return result
 
 
 if __name__ == '__main__':
   sys.exit(main())