change default build (in "make" wrapper) to ninja on all platforms
force-landed from https://codereview.chromium.org/206463007/ ;
the CommitQueue couldn't handle the diff properly for some reason
git-svn-id: http://skia.googlecode.com/svn/trunk@14003 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp_skia b/gyp_skia
index 1ba6fc7..7a45026 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -84,13 +84,13 @@
print ('%s environment variable not set, using default' %
ENVVAR_GYP_GENERATORS)
if sys.platform.startswith('darwin'):
- default_gyp_generators = 'xcode'
+ default_gyp_generators = 'ninja,xcode'
elif sys.platform.startswith('win'):
- default_gyp_generators = 'msvs'
+ default_gyp_generators = 'ninja,msvs'
elif sys.platform.startswith('cygwin'):
- default_gyp_generators = 'msvs'
+ default_gyp_generators = 'ninja,msvs'
else:
- default_gyp_generators = 'make'
+ default_gyp_generators = 'ninja'
os.environ[ENVVAR_GYP_GENERATORS] = default_gyp_generators
print '%s is "%s"' % (ENVVAR_GYP_GENERATORS, os.getenv(ENVVAR_GYP_GENERATORS))