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 /chrome/chrome_browser.gypi | |
| 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 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 0ce0575..7937bf6 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3580,7 +3580,7 @@ ['exclude', '^browser/chromeos/input_method/candidate_window.h'], ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:dbus-glib', '../build/linux/system.gyp:gconf', @@ -3648,7 +3648,7 @@ ], }], ], - }, { # OS != "linux" + }, { # toolkit_uses_gtk != 1 'sources!': [ # TODO(mattm): Cert manager stuff is really !USE_NSS. 'browser/certificate_manager_model.cc', @@ -3657,14 +3657,6 @@ 'browser/ui/webui/options/certificate_manager_handler.h', ], }], - ['OS=="freebsd" or OS=="openbsd"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:gtkprint', - '../build/linux/system.gyp:nss', - '../build/linux/system.gyp:x11', - ], - }], ['OS=="mac"', { 'sources!': [ 'browser/automation/automation_provider_list_generic.cc', @@ -4266,14 +4258,14 @@ }], # Exclude extension_input_ui_api again # (Required because of the '^browser/extensions/' include abrove) - ['OS=="linux" and ( touchui==0 or chromeos==0 )', { + ['toolkit_uses_gtk == 1 and ( touchui == 0 or chromeos == 0 )', { 'sources/': [ ['exclude', '^browser/extensions/extension_input_ui_api.cc'], ['exclude', '^browser/extensions/extension_input_ui_api.h'], ], }], # GTK build only - ['OS=="linux" and toolkit_views==0', { + ['toolkit_uses_gtk == 1 and toolkit_views == 0', { 'sources/': [ ['include', '^browser/printing/print_dialog_gtk.cc'], ['include', '^browser/printing/print_dialog_gtk.h'], @@ -4361,7 +4353,7 @@ }, ], }], - ['OS=="linux" and gcc_version==45', { + ['os_posix == 1 and OS != "mac" and gcc_version == 45', { # Avoid gcc 4.5 miscompilation of template_url.cc # as per http://crbug.com/41887 'cflags': [ |