commit d6d15b8e29d85f898388d521b919231df278df54
author jiangj@opera.com <jiangj@opera.com> Mon Apr 20 06:43:48 2015 +0000
committer jiangj@opera.com <jiangj@opera.com> Mon Apr 20 06:43:48 2015 +0000
tree 72d7a6978ed7f22e4bf41c505838393c7b9e7ce3
parent 5604359d270cf2ae885acf9a39222bba2cc77f32

Fix GetPrimarySolutionPath() to not include buildtools

GetPrimarySolutionPath() is used by GetBuildtoolsPath() to locate
the chromium/src directory, its return value shouldn't include
'buildtools', since GetBuildtoolsPath() will append another one to
it.

Introduced by https://codereview.chromium.org/933383002

Review URL: https://codereview.chromium.org/1072973003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294894 0039d316-1c4b-4281-b951-d872f2087c98

gclient_utils.py

diff --git a/gclient_utils.py b/gclient_utils.py
index f80cd78..d2f0af6 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -679,7 +679,7 @@
       pass
     top_dir = top_dir[0]
     if os.path.exists(os.path.join(top_dir, 'buildtools')):
-      return os.path.join(top_dir, 'buildtools')
+      return top_dir
     return None
 
   # Some projects' top directory is not named 'src'.