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

Side by Side 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, 5 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 19 matching lines...) Expand all
30 # Websockets and socket stream are not used on iOS. 30 # Websockets and socket stream are not used on iOS.
31 'enable_websockets%': 0, 31 'enable_websockets%': 0,
32 # iOS does not use V8. 32 # iOS does not use V8.
33 'use_v8_in_net%': 0, 33 'use_v8_in_net%': 0,
34 'enable_built_in_dns%': 0, 34 'enable_built_in_dns%': 0,
35 }, { 35 }, {
36 'enable_websockets%': 1, 36 'enable_websockets%': 1,
37 'use_v8_in_net%': 1, 37 'use_v8_in_net%': 1,
38 'enable_built_in_dns%': 1, 38 'enable_built_in_dns%': 1,
39 }], 39 }],
40 ['chromecast==1', {
41 'use_direct_config_service%': 1,
42 }, {
43 'use_direct_config_service%': 0,
44 }],
40 ], 45 ],
41 }, 46 },
42 'includes': [ 47 'includes': [
43 '../build/win_precompile.gypi', 48 '../build/win_precompile.gypi',
44 'net.gypi', 49 'net.gypi',
45 ], 50 ],
46 'targets': [ 51 'targets': [
47 { 52 {
48 'target_name': 'net_derived_sources', 53 'target_name': 'net_derived_sources',
49 'type': 'none', 54 'type': 'none',
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 '<@(net_nacl_common_sources)', 106 '<@(net_nacl_common_sources)',
102 '<@(net_non_nacl_sources)', 107 '<@(net_non_nacl_sources)',
103 ], 108 ],
104 'defines': [ 109 'defines': [
105 'NET_IMPLEMENTATION', 110 'NET_IMPLEMENTATION',
106 ], 111 ],
107 'export_dependent_settings': [ 112 'export_dependent_settings': [
108 '../base/base.gyp:base', 113 '../base/base.gyp:base',
109 ], 114 ],
110 'conditions': [ 115 'conditions': [
116 ['chromeos==1 or OS=="android" or chromecast==1', {
117 'defines': [
118 'USE_NETWORK_CHANGE_NOTIFIER_FACTORY',
119 ],
120 }],
111 ['chromeos==1', { 121 ['chromeos==1', {
112 'sources!': [ 122 'sources!': [
113 'base/network_change_notifier_linux.cc', 123 'base/network_change_notifier_linux.cc',
114 'base/network_change_notifier_linux.h', 124 'base/network_change_notifier_linux.h',
115 'base/network_change_notifier_netlink_linux.cc', 125 'base/network_change_notifier_netlink_linux.cc',
116 'base/network_change_notifier_netlink_linux.h', 126 'base/network_change_notifier_netlink_linux.h',
117 'proxy/proxy_config_service_linux.cc', 127 'proxy/proxy_config_service_linux.cc',
118 'proxy/proxy_config_service_linux.h', 128 'proxy/proxy_config_service_linux.h',
119 ], 129 ],
120 }], 130 }],
(...skipping 20 matching lines...) Expand all
141 }], 151 }],
142 ], 152 ],
143 }, { # use_kerberos == 0 153 }, { # use_kerberos == 0
144 'sources!': [ 154 'sources!': [
145 'http/http_auth_gssapi_posix.cc', 155 'http/http_auth_gssapi_posix.cc',
146 'http/http_auth_gssapi_posix.h', 156 'http/http_auth_gssapi_posix.h',
147 'http/http_auth_handler_negotiate.h', 157 'http/http_auth_handler_negotiate.h',
148 'http/http_auth_handler_negotiate.cc', 158 'http/http_auth_handler_negotiate.cc',
149 ], 159 ],
150 }], 160 }],
161 ['use_direct_config_service==1', {
162 'defines': [
163 'USE_DIRECT_CONFIG_SERVICE',
164 ],
165 }],
151 ['posix_avoid_mmap==1', { 166 ['posix_avoid_mmap==1', {
152 'defines': [ 167 'defines': [
153 'POSIX_AVOID_MMAP', 168 'POSIX_AVOID_MMAP',
154 ], 169 ],
155 'direct_dependent_settings': { 170 'direct_dependent_settings': {
156 'defines': [ 171 'defines': [
157 'POSIX_AVOID_MMAP', 172 'POSIX_AVOID_MMAP',
158 ], 173 ],
159 }, 174 },
160 'sources!': [ 175 'sources!': [
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 ], 323 ],
309 }], 324 }],
310 [ 'desktop_linux == 1 or chromeos == 1', { 325 [ 'desktop_linux == 1 or chromeos == 1', {
311 'conditions': [ 326 'conditions': [
312 ['use_openssl == 0', { 327 ['use_openssl == 0', {
313 # use NSS 328 # use NSS
314 'dependencies': [ 329 'dependencies': [
315 '../build/linux/system.gyp:ssl', 330 '../build/linux/system.gyp:ssl',
316 ], 331 ],
317 }], 332 }],
318 ['os_bsd==1', { 333 ['os_bsd==1 or chromecast==1', {
319 'sources!': [ 334 'sources!': [
320 'base/network_change_notifier_linux.cc', 335 'base/network_change_notifier_linux.cc',
321 'base/network_change_notifier_netlink_linux.cc', 336 'base/network_change_notifier_netlink_linux.cc',
322 'proxy/proxy_config_service_linux.cc', 337 'proxy/proxy_config_service_linux.cc',
323 ], 338 ],
324 },{ 339 },{
325 'dependencies': [ 340 'dependencies': [
326 '../build/linux/system.gyp:libresolv', 341 '../build/linux/system.gyp:libresolv',
327 ], 342 ],
328 }], 343 }],
(...skipping 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after
1668 'net_unittests.isolate', 1683 'net_unittests.isolate',
1669 ], 1684 ],
1670 'sources': [ 1685 'sources': [
1671 'net_unittests.isolate', 1686 'net_unittests.isolate',
1672 ], 1687 ],
1673 }, 1688 },
1674 ], 1689 ],
1675 }], 1690 }],
1676 ], 1691 ],
1677 } 1692 }
OLDNEW
« 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