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

Side by Side Diff: net/net.gyp

Issue 381073002: Move sqlite_channel_id_store from chrome/browser/net to net/extras. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix flaky TestDeleteAll. Created 6 years, 3 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/extras/sqlite/sqlite_channel_id_store_unittest.cc ('k') | net/net.gypi » ('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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 '../crypto/crypto.gyp:crypto', 542 '../crypto/crypto.gyp:crypto',
543 '../crypto/crypto.gyp:crypto_test_support', 543 '../crypto/crypto.gyp:crypto_test_support',
544 '../testing/gmock.gyp:gmock', 544 '../testing/gmock.gyp:gmock',
545 '../testing/gtest.gyp:gtest', 545 '../testing/gtest.gyp:gtest',
546 '../third_party/zlib/zlib.gyp:zlib', 546 '../third_party/zlib/zlib.gyp:zlib',
547 '../url/url.gyp:url_lib', 547 '../url/url.gyp:url_lib',
548 'balsa', 548 'balsa',
549 'http_server', 549 'http_server',
550 'net', 550 'net',
551 'net_derived_sources', 551 'net_derived_sources',
552 'net_extras',
552 'net_test_support', 553 'net_test_support',
553 'quic_tools', 554 'quic_tools',
554 ], 555 ],
555 'sources': [ 556 'sources': [
556 '<@(net_test_sources)', 557 '<@(net_test_sources)',
557 ], 558 ],
558 'conditions': [ 559 'conditions': [
559 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 560 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
560 'dependencies': [ 561 'dependencies': [
561 'epoll_server', 562 'epoll_server',
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 { 1043 {
1043 'action_name': 'net_resources', 1044 'action_name': 'net_resources',
1044 'variables': { 1045 'variables': {
1045 'grit_grd_file': 'base/net_resources.grd', 1046 'grit_grd_file': 'base/net_resources.grd',
1046 }, 1047 },
1047 'includes': [ '../build/grit_action.gypi' ], 1048 'includes': [ '../build/grit_action.gypi' ],
1048 }, 1049 },
1049 ], 1050 ],
1050 }, 1051 },
1051 { 1052 {
1053 'target_name': 'net_extras',
1054 'type': 'static_library',
1055 'variables': { 'enable_wexit_time_destructors': 1, },
1056 'dependencies': [
1057 '../base/base.gyp:base',
1058 '../sql/sql.gyp:sql',
1059 'net',
1060 ],
1061 'sources': [
1062 '<@(net_extras_sources)',
1063 ],
1064 },
1065 {
1052 'target_name': 'http_server', 1066 'target_name': 'http_server',
1053 'type': 'static_library', 1067 'type': 'static_library',
1054 'variables': { 'enable_wexit_time_destructors': 1, }, 1068 'variables': { 'enable_wexit_time_destructors': 1, },
1055 'dependencies': [ 1069 'dependencies': [
1056 '../base/base.gyp:base', 1070 '../base/base.gyp:base',
1057 'net', 1071 'net',
1058 ], 1072 ],
1059 'sources': [ 1073 'sources': [
1060 'server/http_connection.cc', 1074 'server/http_connection.cc',
1061 'server/http_connection.h', 1075 'server/http_connection.h',
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 'net_unittests.isolate', 1725 'net_unittests.isolate',
1712 ], 1726 ],
1713 'sources': [ 1727 'sources': [
1714 'net_unittests.isolate', 1728 'net_unittests.isolate',
1715 ], 1729 ],
1716 }, 1730 },
1717 ], 1731 ],
1718 }], 1732 }],
1719 ], 1733 ],
1720 } 1734 }
OLDNEW
« no previous file with comments | « net/extras/sqlite/sqlite_channel_id_store_unittest.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698