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

Side by Side Diff: net/net.gyp

Issue 1047103002: Avoid initial NetworkChangeNotifier OnDNSChanged() signal on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert an accidental test enabling Created 5 years, 8 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/dns/host_resolver_impl_unittest.cc ('k') | net/tools/net_watcher/net_watcher.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 'conditions': [ 10 'conditions': [
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 }], 163 }],
164 ['chromeos==1', { 164 ['chromeos==1', {
165 'sources!': [ 165 'sources!': [
166 'proxy/proxy_config_service_linux_unittest.cc', 166 'proxy/proxy_config_service_linux_unittest.cc',
167 ], 167 ],
168 }], 168 }],
169 [ 'OS == "android"', { 169 [ 'OS == "android"', {
170 'sources!': [ 170 'sources!': [
171 # See bug http://crbug.com/344533. 171 # See bug http://crbug.com/344533.
172 'disk_cache/blockfile/index_table_v3_unittest.cc', 172 'disk_cache/blockfile/index_table_v3_unittest.cc',
173 # No res_ninit() et al on Android, so this doesn't make a lot of
174 # sense.
175 'dns/dns_config_service_posix_unittest.cc',
176 ], 173 ],
177 'dependencies': [ 174 'dependencies': [
178 'net_javatests', 175 'net_javatests',
179 'net_test_jni_headers', 176 'net_test_jni_headers',
180 ], 177 ],
181 }], 178 }],
182 [ 'use_nss != 1', { 179 [ 'use_nss != 1', {
183 'sources!': [ 180 'sources!': [
184 'ssl/client_cert_store_chromeos_unittest.cc', 181 'ssl/client_cert_store_chromeos_unittest.cc',
185 'ssl/client_cert_store_nss_unittest.cc', 182 'ssl/client_cert_store_nss_unittest.cc',
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 # iOS. 391 # iOS.
395 # OS is not "linux" or "freebsd" or "openbsd". 392 # OS is not "linux" or "freebsd" or "openbsd".
396 'socket/unix_domain_client_socket_posix_unittest.cc', 393 'socket/unix_domain_client_socket_posix_unittest.cc',
397 'socket/unix_domain_listen_socket_posix_unittest.cc', 394 'socket/unix_domain_listen_socket_posix_unittest.cc',
398 'socket/unix_domain_server_socket_posix_unittest.cc', 395 'socket/unix_domain_server_socket_posix_unittest.cc',
399 396
400 # See bug http://crbug.com/344533. 397 # See bug http://crbug.com/344533.
401 'disk_cache/blockfile/index_table_v3_unittest.cc', 398 'disk_cache/blockfile/index_table_v3_unittest.cc',
402 ], 399 ],
403 }], 400 }],
404 [ 'OS == "android"', {
405 'sources!': [
406 'dns/dns_config_service_posix_unittest.cc',
407 ],
408 },
409 ],
410 ['OS == "android"', { 401 ['OS == "android"', {
411 # TODO(mmenke): This depends on test_support_base, which depends on 402 # TODO(mmenke): This depends on test_support_base, which depends on
412 # icu. Figure out a way to remove that dependency. 403 # icu. Figure out a way to remove that dependency.
413 'dependencies': [ 404 'dependencies': [
414 '../testing/android/native_test.gyp:native_test_native_code', 405 '../testing/android/native_test.gyp:native_test_native_code',
415 ] 406 ]
416 }], 407 }],
417 [ 'use_icu_alternatives_on_android == 1', { 408 [ 'use_icu_alternatives_on_android == 1', {
418 'dependencies!': [ 409 'dependencies!': [
419 '../base/base.gyp:base_i18n', 410 '../base/base.gyp:base_i18n',
(...skipping 1116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1536 '../build/isolate.gypi', 1527 '../build/isolate.gypi',
1537 ], 1528 ],
1538 'sources': [ 1529 'sources': [
1539 'net_unittests.isolate', 1530 'net_unittests.isolate',
1540 ], 1531 ],
1541 }, 1532 },
1542 ], 1533 ],
1543 }], 1534 }],
1544 ], 1535 ],
1545 } 1536 }
OLDNEW
« no previous file with comments | « net/dns/host_resolver_impl_unittest.cc ('k') | net/tools/net_watcher/net_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698