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

Unified Diff: build/gyp_chromium

Issue 171513010: Move the "import find_depot_tools" line to sections that actually use it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add self to AUTHORS file Created 6 years, 10 months 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 | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index ae1d4c2f66242d7c883b990078479bfd92f86836..832ea37bbeaf5715b115581d9576f2e609e72573 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'))
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698