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

Side by Side Diff: net/net.gyp

Issue 361083002: Small cleanups to ported QuicServer and dependencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bring back quic_tools (formerly quic_ported_server) 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 | « no previous file | net/quic/quic_in_memory_cache.h » ('j') | net/quic/quic_in_memory_cache.h » ('J')
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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 '../crypto/crypto.gyp:crypto', 539 '../crypto/crypto.gyp:crypto',
540 '../testing/gmock.gyp:gmock', 540 '../testing/gmock.gyp:gmock',
541 '../testing/gtest.gyp:gtest', 541 '../testing/gtest.gyp:gtest',
542 '../third_party/zlib/zlib.gyp:zlib', 542 '../third_party/zlib/zlib.gyp:zlib',
543 '../url/url.gyp:url_lib', 543 '../url/url.gyp:url_lib',
544 'balsa', 544 'balsa',
545 'http_server', 545 'http_server',
546 'net', 546 'net',
547 'net_derived_sources', 547 'net_derived_sources',
548 'net_test_support', 548 'net_test_support',
549 'quic_ported_server', 549 'quic_tools',
550 ], 550 ],
551 'sources': [ 551 'sources': [
552 '<@(net_test_sources)', 552 '<@(net_test_sources)',
553 ], 553 ],
554 'conditions': [ 554 'conditions': [
555 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 555 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
556 'dependencies': [ 556 'dependencies': [
557 'epoll_server', 557 'epoll_server',
558 'flip_in_mem_edsm_server_base', 558 'flip_in_mem_edsm_server_base',
559 'quic_base', 559 'quic_base',
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 'tools/dump_cache/url_to_filename_encoder.h', 1111 'tools/dump_cache/url_to_filename_encoder.h',
1112 'tools/dump_cache/url_utilities.h', 1112 'tools/dump_cache/url_utilities.h',
1113 'tools/dump_cache/url_utilities.cc', 1113 'tools/dump_cache/url_utilities.cc',
1114 ], 1114 ],
1115 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1115 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1116 'msvs_disabled_warnings': [4267, ], 1116 'msvs_disabled_warnings': [4267, ],
1117 }, 1117 },
1118 { 1118 {
1119 # This is a temporary target which will be merged into 'net' once the 1119 # This is a temporary target which will be merged into 'net' once the
1120 # dependency on balsa is eliminated and the classes are actually used. 1120 # dependency on balsa is eliminated and the classes are actually used.
1121 'target_name': 'quic_ported_server', 1121 'target_name': 'quic_tools',
1122 'type': 'static_library', 1122 'type': 'static_library',
1123 'dependencies': [ 1123 'dependencies': [
1124 '../base/base.gyp:base', 1124 '../base/base.gyp:base',
1125 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 1125 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
1126 '../url/url.gyp:url_lib', 1126 '../url/url.gyp:url_lib',
1127 'net', 1127 'net',
1128 ], 1128 ],
1129 'sources': [ 1129 'sources': [
1130 'quic/quic_dispatcher.cc', 1130 'quic/quic_dispatcher.cc',
1131 'quic/quic_dispatcher.h', 1131 'quic/quic_dispatcher.h',
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 'sources': [ 1499 'sources': [
1500 'tools/quic/quic_client_bin.cc', 1500 'tools/quic/quic_client_bin.cc',
1501 ], 1501 ],
1502 }, 1502 },
1503 { 1503 {
1504 'target_name': 'quic_server', 1504 'target_name': 'quic_server',
1505 'type': 'executable', 1505 'type': 'executable',
1506 'dependencies': [ 1506 'dependencies': [
1507 '../base/base.gyp:base', 1507 '../base/base.gyp:base',
1508 'net', 1508 'net',
1509 'quic_ported_server', 1509 'quic_tools',
1510 ], 1510 ],
1511 'sources': [ 1511 'sources': [
1512 'quic/quic_server_bin.cc', 1512 'quic/quic_server_bin.cc',
1513 ], 1513 ],
1514 }, 1514 },
1515 ] 1515 ]
1516 }], 1516 }],
1517 ['OS=="android"', { 1517 ['OS=="android"', {
1518 'targets': [ 1518 'targets': [
1519 { 1519 {
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1699 'net_unittests.isolate', 1699 'net_unittests.isolate',
1700 ], 1700 ],
1701 'sources': [ 1701 'sources': [
1702 'net_unittests.isolate', 1702 'net_unittests.isolate',
1703 ], 1703 ],
1704 }, 1704 },
1705 ], 1705 ],
1706 }], 1706 }],
1707 ], 1707 ],
1708 } 1708 }
OLDNEW
« no previous file with comments | « no previous file | net/quic/quic_in_memory_cache.h » ('j') | net/quic/quic_in_memory_cache.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698