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

Unified Diff: net/net.gyp

Issue 223143006: Make necessary changes for chromecast build as chromecast has it own implementation of NetworkChang… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the use of CHROMECAST_BUILD macro. Use feature-based gyp variables and C macros to specify c… Created 6 years, 6 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/network_change_notifier.cc ('k') | net/proxy/proxy_service.cc » ('j') | 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 84184237d076edce1fdecddbb44c28ea4cc6df90..0e8ef0fae11968673291143b3da19801e9a07472 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -37,6 +37,11 @@
'use_v8_in_net%': 1,
'enable_built_in_dns%': 1,
}],
+ ['chromecast==1', {
+ 'use_direct_config_service%': 1,
+ }, {
+ 'use_direct_config_service%': 0,
+ }],
],
},
'includes': [
@@ -108,6 +113,11 @@
'../base/base.gyp:base',
],
'conditions': [
+ ['chromeos==1 or OS=="android" or chromecast==1', {
+ 'defines': [
+ 'USE_NETWORK_CHANGE_NOTIFIER_FACTORY',
+ ],
+ }],
['chromeos==1', {
'sources!': [
'base/network_change_notifier_linux.cc',
@@ -148,6 +158,11 @@
'http/http_auth_handler_negotiate.cc',
],
}],
+ ['use_direct_config_service==1', {
+ 'defines': [
+ 'USE_DIRECT_CONFIG_SERVICE',
+ ],
+ }],
['posix_avoid_mmap==1', {
'defines': [
'POSIX_AVOID_MMAP',
@@ -315,7 +330,7 @@
'../build/linux/system.gyp:ssl',
],
}],
- ['os_bsd==1', {
+ ['os_bsd==1 or chromecast==1', {
'sources!': [
'base/network_change_notifier_linux.cc',
'base/network_change_notifier_netlink_linux.cc',
« no previous file with comments | « net/base/network_change_notifier.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698