diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 21:49:41 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 21:49:41 +0000 |
| commit | cb5e507bf311305117bc727d94921e89c2dee7de (patch) | |
| tree | 22f7032c4d0770a3042d5d5cd64e37733aa3af38 /webkit | |
| parent | 0d920aacaa1c7439ad940b282ea84dd3c3dacfd4 (diff) | |
| download | chromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.zip chromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.tar.gz chromium_src-cb5e507bf311305117bc727d94921e89c2dee7de.tar.bz2 | |
Make use of the new cross-platform POSIX defines toolkit_uses_gtk, os_posix, and use_x11 for the gyp files. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. I also added Solaris to the remaining grit files.
Patch by ruben (chromium@hybridsource.org).
Review URL: http://codereview.chromium.org/7011032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 5 | ||||
| -rw-r--r-- | webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 18 |
3 files changed, 13 insertions, 14 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 1b1f3df..16b7197 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -445,15 +445,14 @@ # own hard dependencies. 'hard_dependency': 1, 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:gtk', ], 'sources!': [ 'plugins/plugin_stubs.cc', ], - }, { # else: OS!="linux" and OS!="freebsd" and OS!="openbsd" \ - # and OS!="solaris"' + }, { # else: toolkit_uses_gtk != 1 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'], ['exclude', r'/gtk_']], }], diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp index 7f987bb..4c9e8d2 100644 --- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp +++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp @@ -47,11 +47,11 @@ ], }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'type': 'shared_library', 'cflags': ['-fvisibility=hidden'], }], - ['OS=="linux" or OS=="openbsd" or OS=="freebsd" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { + ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm") and linux_fpic != 1', { 'product_name': 'pepper_test_plugin', # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'], diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 65cc1c9..82cbdab 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': [ @@ -463,7 +463,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', @@ -505,7 +505,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': [ @@ -625,13 +625,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'] }], @@ -660,7 +660,7 @@ }, ] }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'copies': [ { 'destination': '<(PRODUCT_DIR)/plugins', @@ -672,7 +672,7 @@ }, ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'targets': [ { 'target_name': 'test_shell_resources', |