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

Side by Side Diff: net/net.gyp

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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/DEPS ('k') | net/test/run_all_unittests.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 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 # Enables BidirectionalStream; Used in cronet, disabled by default. 9 # Enables BidirectionalStream; Used in cronet, disabled by default.
10 'enable_bidirectional_stream%': 0, 10 'enable_bidirectional_stream%': 0,
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 'proxy/proxy_resolver_v8_unittest.cc', 323 'proxy/proxy_resolver_v8_unittest.cc',
324 ], 324 ],
325 }, 325 },
326 ], 326 ],
327 327
328 [ 'use_v8_in_net==1 and OS != "android"', { 328 [ 'use_v8_in_net==1 and OS != "android"', {
329 'dependencies': [ 329 'dependencies': [
330 'net_with_v8', 330 'net_with_v8',
331 'net_browser_services', 331 'net_browser_services',
332 'net_utility_services', 332 'net_utility_services',
333 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 333 '../mojo/mojo_edk.gyp:mojo_system_impl',
334 ], 334 ],
335 }, { # else 335 }, { # else
336 'sources!': [ 336 'sources!': [
337 'dns/host_resolver_mojo_unittest.cc', 337 'dns/host_resolver_mojo_unittest.cc',
338 'dns/mojo_host_resolver_impl_unittest.cc', 338 'dns/mojo_host_resolver_impl_unittest.cc',
339 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', 339 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc',
340 'proxy/mojo_proxy_resolver_impl_unittest.cc', 340 'proxy/mojo_proxy_resolver_impl_unittest.cc',
341 'proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc', 341 'proxy/mojo_proxy_resolver_v8_tracing_bindings_unittest.cc',
342 'proxy/proxy_resolver_factory_mojo_unittest.cc', 342 'proxy/proxy_resolver_factory_mojo_unittest.cc',
343 'proxy/proxy_service_mojo_unittest.cc', 343 'proxy/proxy_service_mojo_unittest.cc',
(...skipping 1375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1719 '../build/isolate.gypi', 1719 '../build/isolate.gypi',
1720 ], 1720 ],
1721 'sources': [ 1721 'sources': [
1722 'net_unittests.isolate', 1722 'net_unittests.isolate',
1723 ], 1723 ],
1724 }, 1724 },
1725 ], 1725 ],
1726 }], 1726 }],
1727 ], 1727 ],
1728 } 1728 }
OLDNEW
« no previous file with comments | « net/DEPS ('k') | net/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698