Index: webkit/tools/test_shell/test_shell.gypi |
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi |
index d289200b5ae627e035297fc519395674996612ac..ca3a10065511837154a6d414f3d2d0db0162fad4 100644 |
--- a/webkit/tools/test_shell/test_shell.gypi |
+++ b/webkit/tools/test_shell/test_shell.gypi |
@@ -120,7 +120,7 @@ |
'copy_npapi_test_plugin', |
], |
}], |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |
+ ['toolkit_uses_gtk==1', { |
'dependencies': [ |
'test_shell_resources', |
'<(DEPTH)/build/linux/system.gyp:gtk', |
@@ -161,7 +161,7 @@ |
'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak', |
}, |
'conditions': [ |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
+ ['os_posix==1 and OS!="mac"', { |
'actions': [ |
{ |
'action_name': 'test_shell_repack', |
@@ -265,7 +265,7 @@ |
}, |
}, |
}], |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |
+ ['toolkit_uses_gtk==1', { |
'conditions': [ |
['linux_use_tcmalloc==1', { |
'dependencies': [ |
@@ -462,7 +462,7 @@ |
}, |
}, |
}], |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |
+ ['toolkit_uses_gtk==1', { |
'dependencies': [ |
'test_shell_pak', |
'<(DEPTH)/build/linux/system.gyp:gtk', |
@@ -504,7 +504,7 @@ |
'../../../skia/ext/vector_canvas_unittest.cc', |
], |
}], |
- ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { |
+ ['os_posix==1 and OS!="mac"', { |
'conditions': [ |
['linux_use_tcmalloc==1', { |
'dependencies': [ |
@@ -624,13 +624,13 @@ |
], |
}, |
}], |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
+ ['os_posix==1 and OS!="mac"', { |
'sources!': [ |
# Needs simple event record type porting |
'../../plugins/npapi/test/plugin_windowless_test.cc', |
], |
}], |
- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', { |
+ ['os_posix==1 and OS!="mac" and (target_arch=="x64" or target_arch=="arm")', { |
# Shared libraries need -fPIC on x86-64 |
'cflags': ['-fPIC'] |
}], |
@@ -659,7 +659,7 @@ |
}, |
] |
}], |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |
+ ['os_posix==1 and OS!="mac"', { |
'copies': [ |
{ |
'destination': '<(PRODUCT_DIR)/plugins', |
@@ -671,7 +671,7 @@ |
}, |
], |
}], |
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { |
+ ['os_posix==1 and OS!="mac"', { |
'targets': [ |
{ |
'target_name': 'test_shell_resources', |