diff options
| author | saiarcot895@gmail.com <saiarcot895@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 00:30:29 +0000 |
|---|---|---|
| committer | saiarcot895@gmail.com <saiarcot895@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 00:30:29 +0000 |
| commit | 6307f72bda36407b9abf1212e3070e5d13b00c9c (patch) | |
| tree | 3c08495f05ff2239998faee0552df06d66f5924e /build/gyp_chromium | |
| parent | 3e69d9571cd3d90096cc0293e90e411bb5a9471b (diff) | |
| download | chromium_src-6307f72bda36407b9abf1212e3070e5d13b00c9c.zip chromium_src-6307f72bda36407b9abf1212e3070e5d13b00c9c.tar.gz chromium_src-6307f72bda36407b9abf1212e3070e5d13b00c9c.tar.bz2 | |
Move the "import find_depot_tools" line to sections that actually use it.
This shrinks the dependency of depot_tools to only Windows and Cygwin, and allows those on other OSes to just build tarballs of sources without also having the depot_tools.
BUG=none
Review URL: https://codereview.chromium.org/171513010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index ae1d4c2..832ea37 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -39,8 +39,6 @@ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'liblouis')) sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', 'Source', 'build', 'scripts')) -import find_depot_tools - # On Windows, Psyco shortens warm runs of build/gyp_chromium by about # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70 # seconds. Conversely, memory usage of build/gyp_chromium with Psyco @@ -381,6 +379,7 @@ if __name__ == '__main__': # TODO(bradnelson): take this out once this issue is fixed: # http://code.google.com/p/gyp/issues/detail?id=177 if sys.platform == 'cygwin': + import find_depot_tools depot_tools_path = find_depot_tools.add_depot_tools_to_path() python_dir = sorted(glob.glob(os.path.join(depot_tools_path, 'python2*_bin')))[-1] @@ -443,6 +442,7 @@ if __name__ == '__main__': # depot_tools, then use it. vs2013_runtime_dll_dirs = None if sys.platform in ('win32', 'cygwin'): + import find_depot_tools depot_tools_path = find_depot_tools.add_depot_tools_to_path() toolchain = os.path.normpath(os.path.join( depot_tools_path, 'win_toolchain', 'vs2013_files')) |