Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(589)

Unified Diff: gclient_utils.py

Issue 718213002: Search for buildtools in the gclient root, if not in the main repo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient_utils.py
diff --git a/gclient_utils.py b/gclient_utils.py
index a21e65a5fc31c5d01af67dc395f1ea65fabea86d..069d5d759e669317815ea069353e1b05358f2554 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -684,7 +684,11 @@ def GetBuildtoolsPath():
# Some projects' top directory is not named 'src'.
source_dir_name = GetGClientPrimarySolutionName(gclient_root) or 'src'
- return os.path.join(gclient_root, source_dir_name, 'buildtools')
+ buildtools_path = os.path.join(gclient_root, source_dir_name, 'buildtools')
+ if not os.path.exists(buildtools_path):
+ # Buildtools may be in the gclient root.
+ buildtools_path = os.path.join(gclient_root, 'buildtools')
+ return buildtools_path
def GetBuildtoolsPlatformBinaryPath():
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698