Do not need to find depot_tools and run GN when GYP_GENERATORS=make

build/gyp_chromium

Index: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 9353752f6514d055058fd09507b688e067a0979f..d3c70b78dfad35695dae7af73b2e2c4c99504e57 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
@@ -475,8 +473,11 @@ if __name__ == '__main__':
     args.append('--check')
 
   supplemental_includes = GetSupplementalFiles()
-  if not RunGN(supplemental_includes):
-    sys.exit(1)
+  if os.environ.get('GYP_GENERATORS') == 'ninja':
+    import find_depot_tools

[Paweł Hajdan Jr., 2014/02/10 18:43:24]

It's not obvious why find_depot_tools would be needed here.

Also, GYP_GENERATORS=ninja in env is _not_ needed to enable ninja. Some
platforms already default to it.

+    if not RunGN(supplemental_includes):
+      sys.exit(1)
+
   args.extend(
       ['-I' + i for i in additional_include_files(supplemental_includes, args)])