1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
--- net/net.gyp.orig 2014-10-10 09:15:31 UTC
+++ net/net.gyp
@@ -316,9 +316,10 @@
}],
['os_bsd==1', {
'sources!': [
+ 'base/address_tracker_linux.cc',
'base/network_change_notifier_linux.cc',
'base/network_change_notifier_netlink_linux.cc',
- 'proxy/proxy_config_service_linux.cc',
+# 'proxy/proxy_config_service_linux.cc',
],
},{
'dependencies': [
@@ -551,7 +552,7 @@
'<@(net_test_sources)',
],
'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
'dependencies': [
'epoll_server',
'flip_in_mem_edsm_server_base',
@@ -1033,6 +1034,11 @@
'test/cert_test_util_nss.cc',
],
}],
+ [ 'os_bsd == 1', {
+ 'sources!': [
+ 'base/address_tracker_linux_unittest.cc',
+ ],
+ }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],
|
