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

Unified Diff: webkit/tools/test_shell/test_shell.gyp

Issue 100146: Changes in preparation for webkit switch to gyp.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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
Index: webkit/tools/test_shell/test_shell.gyp
===================================================================
--- webkit/tools/test_shell/test_shell.gyp (revision 14814)
+++ webkit/tools/test_shell/test_shell.gyp (working copy)
@@ -488,10 +488,10 @@
},
],
}],
- # Need to do the same for Win and Linux. We build a separate dylib/dll/so
+ # Need to do the same for Linux. We build a separate dylib/dll/so
# so V8 can have a second set of global variables and run workers.
# Normally, workers run in a separate process.
- ['OS=="mac"', {
+ ['OS!="linux"', {
'targets': [
{
'target_name': 'test_worker',
@@ -499,6 +499,8 @@
'xcode_settings': {
'EXPORTED_SYMBOLS_FILE': 'test_worker/test_worker.exp',
},
+ 'msvs_guid': '3E03D462-780D-4C4D-B22E-5E095E6CF110',
+ 'msvs_disabled_warnings': [4800],
'dependencies': [
'../../../base/base.gyp:base',
'../../../base/base.gyp:base_gfx',
@@ -512,7 +514,13 @@
'sources': [
'test_worker/test_webworker.cc',
'test_worker/test_worker_main.cc',
+ 'test_worker/test_worker.def',
],
+ 'conditions': [
+ ['OS!="win"', {
+ 'sources!' : ['test_worker/test_worker.def'],
+ }],
+ ],
},
],
}],

Powered by Google App Engine
This is Rietveld 408576698