Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2779)

Unified Diff: chrome/chrome_browser.gypi

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: updated to trunk and fixed some nits Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6e636391e8300d56a179418789843b1524856861..0ee91c69f61ecd57ad469619ba00eae5bdb0c5c5 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,7 +3644,7 @@
],
}],
],
- }, { # OS != "linux"
+ }, { # toolkit_uses_gtk != 1
'sources!': [
# TODO(mattm): Cert manager stuff is really !USE_NSS.
'browser/certificate_manager_model.cc',
@@ -3653,14 +3653,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',
@@ -4262,14 +4254,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'],
@@ -4357,7 +4349,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': [
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_common.gypi » ('j') | chrome/chrome_common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698