Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index edd0a824fb63a0e98120eb19d03e710a97d950b7..7dade205bd0aa9e13bfed39f4cedbbbd5ba8e376 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -3576,7 +3576,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', |
@@ -3644,20 +3644,12 @@ |
], |
}], |
], |
- }, { # OS != "linux" |
+ }, { # toolkit_uses_gtk != 1 |
'sources!': [ |
'browser/ui/webui/options/certificate_manager_handler.cc', |
'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', |
@@ -4255,14 +4247,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'], |
@@ -4350,7 +4342,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': [ |