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

Unified Diff: net/net.gyp

Issue 7944011: aura: Make 'net' build with gtk disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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
« no previous file with comments | « net/base/platform_mime_util_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 1b752b7a7fcfa755ee3c79d756efca2eb8dc027b..49f355ef9af1efbdcd60f531c015d2fea2623077 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -790,10 +790,9 @@
],
},
],
- [ 'toolkit_uses_gtk == 1', {
+ [ 'use_glib == 1', {
'dependencies': [
'../build/linux/system.gyp:gconf',
- '../build/linux/system.gyp:gdk',
'../build/linux/system.gyp:gio',
'../build/linux/system.gyp:libresolv',
],
@@ -837,6 +836,11 @@
],
},
],
+ [ 'toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gdk',
+ ],
+ }],
[ 'OS == "win"', {
'sources!': [
'http/http_auth_handler_ntlm_portable.cc',
@@ -1095,17 +1099,21 @@
'proxy/proxy_config_service_linux_unittest.cc',
],
}],
- [ 'toolkit_uses_gtk == 1', {
+ [ 'use_glib==1', {
'dependencies': [
- '../build/linux/system.gyp:gtk',
'../build/linux/system.gyp:ssl',
],
- },
- { # else: OS is not in the above list
+ }, { # else: OS is not in the above list
'sources!': [
'base/cert_database_nss_unittest.cc',
],
- }
+ },
+ ],
+ [ 'toolkit_uses_gtk == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
+ },
],
[ 'os_posix == 1 and OS != "mac"', {
'conditions': [
« no previous file with comments | « net/base/platform_mime_util_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698