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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_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: 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
« chrome/chrome_tests.gypi ('K') | « chrome/default_plugin/default_plugin.gyp ('k') | content/content_common.gypi » ('j') | ui/gfx/compositor/compositor.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 79c0c63e68eadbc49115b20ff483b0a489cb5cde..d2a54054f9fca7856739053fd324e1349c56f7f6 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', {
tony 2011/05/16 19:25:11 Here too: os_posix==1 and OS!="mac"
'dependencies': [
'../build/linux/system.gyp:dbus-glib',
# For FcLangSetAdd call in render_sandbox_host_linux.cc
@@ -370,7 +370,7 @@
# For XShm* in backing_store_x.cc
'../build/linux/system.gyp:x11',
],
- }, { # OS != "linux"
+ }, { # toolkit_uses_gtk != 1
'sources!': [
# TODO(mattm): Cert manager stuff is really !USE_NSS.
'browser/certificate_manager_model.cc',
« chrome/chrome_tests.gypi ('K') | « chrome/default_plugin/default_plugin.gyp ('k') | content/content_common.gypi » ('j') | ui/gfx/compositor/compositor.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698