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 /content | |
| 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 'content')
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/content_common.gypi | 4 | ||||
| -rw-r--r-- | content/content_plugin.gypi | 2 | ||||
| -rw-r--r-- | content/content_renderer.gypi | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index c14603a..93d09bd 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -361,7 +361,7 @@ ['OS=="win"', { 'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442', }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:dbus-glib', # For FcLangSetAdd call in render_sandbox_host_linux.cc diff --git a/content/content_common.gypi b/content/content_common.gypi index 5e237d4..ebc0e25 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -266,12 +266,12 @@ ], }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], }], - ['OS=="linux" and target_arch!="arm"', { + ['use_x11 == 1 and target_arch != "arm"', { 'sources': [ 'common/gpu/x_util.cc', 'common/gpu/x_util.h', diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi index 94b4dc80..93c0ca9 100644 --- a/content/content_plugin.gypi +++ b/content/content_plugin.gypi @@ -54,7 +54,7 @@ '<(DEPTH)/third_party/wtl/include', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 7205199..6798011 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -175,7 +175,7 @@ 'renderer/command_buffer_proxy.h', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], |