diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKit/chromium/gyp_webkit | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKit/chromium/gyp_webkit')
| -rw-r--r-- | WebKit/chromium/gyp_webkit | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebKit/chromium/gyp_webkit b/WebKit/chromium/gyp_webkit index ef18239..db1aa7a 100644 --- a/WebKit/chromium/gyp_webkit +++ b/WebKit/chromium/gyp_webkit @@ -78,7 +78,7 @@ if __name__ == '__main__': args.extend(['-I' + i for i in additional_include_files(args)]) # On linux, we want gyp to output a makefile (default is scons). - if (platform.system() == 'Linux'): + if platform.system() == 'Linux': args.extend(['-fmake']) # Other command args: @@ -94,6 +94,10 @@ if __name__ == '__main__': # gyp file to execute. 'WebKit.gyp']) + # Generate DRT build files on the platforms that support it. + if platform.system() in ('Darwin', 'Linux'): + args.append('../../WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp') + print 'Updating webkit projects from gyp files...' sys.stdout.flush() |