aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp_skia
diff options
context:
space:
mode:
authorGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-01 07:02:41 +0000
committerGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-01 07:02:41 +0000
commit58d69d846071ff9a84e879041f2f092006bfcd14 (patch)
treeff89f73f603bed7b242ee260f09aba19f563d0b7 /gyp_skia
parent2c48ee83c824964fbcb3dc4733055da0e75e154f (diff)
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
Diffstat (limited to 'gyp_skia')
-rwxr-xr-xgyp_skia8
1 files changed, 4 insertions, 4 deletions
diff --git a/gyp_skia b/gyp_skia
index 1ba6fc78e8..7a4502684f 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -84,13 +84,13 @@ if __name__ == '__main__':
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))