Make gclient_utils.GetBuildtoolsPath() work in a build-spec checkout

gclient_utils.py

 # Copyright (c) 2012 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.
 
 """Generic utils."""
 
 import codecs
 import cStringIO
 import datetime
 import logging
@@ skipping 665 matching lines @@
       CheckCallAndFilter(["git", "rev-parse", "--show-toplevel"],
                          print_stdout=False, filter_fn=filter_fn)
     except Exception:
       pass
     top_dir = top_dir[0]
     if os.path.exists(os.path.join(top_dir, 'buildtools')):
       return top_dir
     return None
 
   # Some projects' top directory is not named 'src'.
-  source_dir_name = GetGClientPrimarySolutionName(gclient_root) or 'src'
+  solution_dict = _GetGClientPrimarySolution(gclient_root)
+  source_dir_name = solution_dict.get('name', 'src')
   return os.path.join(gclient_root, source_dir_name)
 
 
 def GetBuildtoolsPath():
   """Returns the full path to the buildtools directory.
   This is based on the root of the checkout containing the current directory."""
 
   # Overriding the build tools path by environment is highly unsupported and may
   # break without warning.  Do not rely on this for anything important.
   override = os.environ.get('CHROMIUM_BUILDTOOLS_PATH')
   if override is not None:
     return override
 
+  # Attempt to find buildtools/ by reading the DEPS file.
+  gclient_root = FindGclientRoot(os.getcwd())
+  if gclient_root:
+    solution_dict = _GetGClientPrimarySolution(gclient_root)
+    deps_dict = _ReadDepsFileForSolution(gclient_root, solution_dict) or {}
+    for sub_path in deps_dict.get('deps', {}):
+      if sub_path.endswith('/buildtools'):
+        return os.path.join(gclient_root, sub_path)
+
+  # Fall-back to heuristics.
   primary_solution = GetPrimarySolutionPath()
   if not primary_solution:
     return None
   buildtools_path = os.path.join(primary_solution, 'buildtools')
   if not os.path.exists(buildtools_path):
     # Buildtools may be in the gclient root.
-    gclient_root = FindGclientRoot(os.getcwd())
     buildtools_path = os.path.join(gclient_root, 'buildtools')
   return buildtools_path
 
 
 def GetBuildtoolsPlatformBinaryPath():
   """Returns the full path to the binary directory for the current platform."""
   buildtools_path = GetBuildtoolsPath()
   if not buildtools_path:
     return None
 
   if sys.platform.startswith(('cygwin', 'win')):
     subdir = 'win'
   elif sys.platform == 'darwin':
     subdir = 'mac'
   elif sys.platform.startswith('linux'):
       subdir = 'linux64'
   else:
     raise Error('Unknown platform: ' + sys.platform)
   return os.path.join(buildtools_path, subdir)
 
 
 def GetExeSuffix():
   """Returns '' or '.exe' depending on how executables work on this platform."""
   if sys.platform.startswith(('cygwin', 'win')):
     return '.exe'
   return ''
 
 
-def GetGClientPrimarySolutionName(gclient_root_dir_path):
-  """Returns the name of the primary solution in the .gclient file specified."""
-  gclient_config_file = os.path.join(gclient_root_dir_path, '.gclient')
+def _ReadDepsFileForSolution(gclient_root, solution_dict):
+  """Reads the DEPS file for the given solution.
+
+  This stubs out Var(), as it's not currently required.
+  """
+  env = {}
+  if 'name' in solution_dict:
+    deps_file = solution_dict.get('deps_file', 'DEPS')
+    deps_path = os.path.join(gclient_root, solution_dict['name'], deps_file)
+    global_scope = {
+        '__builtins__': {'None': None},
+        'Var': lambda x: '',
+        'deps_os': {},
+    }
+    execfile(deps_path, global_scope, env)
+  return env
+
+
+def _GetGClientPrimarySolution(gclient_root):
+  """Returns the dict for the primary solution in the given gclient path."""
+  gclient_config_file = os.path.join(gclient_root, '.gclient')
   env = {}
   execfile(gclient_config_file, env)
   solutions = env.get('solutions', [])
   if solutions:
-    return solutions[0].get('name')
-  return None
+    return solutions[0]
+  return {}
 
 
 def GetGClientRootAndEntries(path=None):
   """Returns the gclient root and the dict of entries."""
   config_file = '.gclient_entries'
   root = FindFileUpwards(config_file, path)
   if not root:
     print "Can't find %s" % config_file
     return None
   config_path = os.path.join(root, config_file)
@@ skipping 454 matching lines @@
     # Just incase we have some ~/blah paths.
     target = os.path.abspath(os.path.expanduser(target))
     if os.path.isfile(target) and os.access(target, os.X_OK):
       return target
     if sys.platform.startswith('win'):
       for suffix in ('.bat', '.cmd', '.exe'):
         alt_target = target + suffix
         if os.path.isfile(alt_target) and os.access(alt_target, os.X_OK):
           return alt_target
   return None