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

Side by Side Diff: net/net.gyp

Issue 13979002: Add support for split PSL list distinctions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed chrome_frame compilation issue Created 7 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 | Annotate | Revision Log
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 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 'socket/tcp_server_socket_libevent.cc', 1283 'socket/tcp_server_socket_libevent.cc',
1284 'socket/tcp_server_socket_libevent.h', 1284 'socket/tcp_server_socket_libevent.h',
1285 'ssl/client_cert_store_impl_nss.cc', 1285 'ssl/client_cert_store_impl_nss.cc',
1286 'udp/udp_socket_libevent.cc', 1286 'udp/udp_socket_libevent.cc',
1287 'udp/udp_socket_libevent.h', 1287 'udp/udp_socket_libevent.h',
1288 ], 1288 ],
1289 'dependencies': [ 1289 'dependencies': [
1290 '../third_party/nss/nss.gyp:nspr', 1290 '../third_party/nss/nss.gyp:nspr',
1291 '../third_party/nss/nss.gyp:nss', 1291 '../third_party/nss/nss.gyp:nss',
1292 'third_party/nss/ssl.gyp:libssl', 1292 'third_party/nss/ssl.gyp:libssl',
1293 'tld_cleanup',
1294 ], 1293 ],
1295 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1294 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1296 'msvs_disabled_warnings': [4267, ], 1295 'msvs_disabled_warnings': [4267, ],
1297 }, { # else: OS != "win" 1296 }, { # else: OS != "win"
1298 'sources!': [ 1297 'sources!': [
1299 'base/winsock_init.cc', 1298 'base/winsock_init.cc',
1300 'base/winsock_init.h', 1299 'base/winsock_init.h',
1301 'base/winsock_util.cc', 1300 'base/winsock_util.cc',
1302 'base/winsock_util.h', 1301 'base/winsock_util.h',
1303 'proxy/proxy_resolver_winhttp.cc', 1302 'proxy/proxy_resolver_winhttp.cc',
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
1741 'ssl/ssl_config_service_unittest.cc', 1740 'ssl/ssl_config_service_unittest.cc',
1742 'test/python_utils_unittest.cc', 1741 'test/python_utils_unittest.cc',
1743 'test/run_all_unittests.cc', 1742 'test/run_all_unittests.cc',
1744 'test/test_certificate_data.h', 1743 'test/test_certificate_data.h',
1745 'tools/dump_cache/url_to_filename_encoder.cc', 1744 'tools/dump_cache/url_to_filename_encoder.cc',
1746 'tools/dump_cache/url_to_filename_encoder.h', 1745 'tools/dump_cache/url_to_filename_encoder.h',
1747 'tools/dump_cache/url_to_filename_encoder_unittest.cc', 1746 'tools/dump_cache/url_to_filename_encoder_unittest.cc',
1748 'tools/dump_cache/url_utilities.h', 1747 'tools/dump_cache/url_utilities.h',
1749 'tools/dump_cache/url_utilities.cc', 1748 'tools/dump_cache/url_utilities.cc',
1750 'tools/dump_cache/url_utilities_unittest.cc', 1749 'tools/dump_cache/url_utilities_unittest.cc',
1750 'tools/tld_cleanup/tld_cleanup_util_unittest.cc',
1751 'udp/udp_socket_unittest.cc', 1751 'udp/udp_socket_unittest.cc',
1752 'url_request/url_fetcher_impl_unittest.cc', 1752 'url_request/url_fetcher_impl_unittest.cc',
1753 'url_request/url_request_context_builder_unittest.cc', 1753 'url_request/url_request_context_builder_unittest.cc',
1754 'url_request/url_request_filter_unittest.cc', 1754 'url_request/url_request_filter_unittest.cc',
1755 'url_request/url_request_ftp_job_unittest.cc', 1755 'url_request/url_request_ftp_job_unittest.cc',
1756 'url_request/url_request_http_job_unittest.cc', 1756 'url_request/url_request_http_job_unittest.cc',
1757 'url_request/url_request_job_factory_impl_unittest.cc', 1757 'url_request/url_request_job_factory_impl_unittest.cc',
1758 'url_request/url_request_job_unittest.cc', 1758 'url_request/url_request_job_unittest.cc',
1759 'url_request/url_request_throttler_simulation_unittest.cc', 1759 'url_request/url_request_throttler_simulation_unittest.cc',
1760 'url_request/url_request_throttler_test_support.cc', 1760 'url_request/url_request_throttler_test_support.cc',
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 ], 2042 ],
2043 ], 2043 ],
2044 }, 2044 },
2045 { 2045 {
2046 'target_name': 'net_test_support', 2046 'target_name': 'net_test_support',
2047 'type': 'static_library', 2047 'type': 'static_library',
2048 'dependencies': [ 2048 'dependencies': [
2049 '../base/base.gyp:base', 2049 '../base/base.gyp:base',
2050 '../base/base.gyp:test_support_base', 2050 '../base/base.gyp:test_support_base',
2051 '../build/temp_gyp/googleurl.gyp:googleurl', 2051 '../build/temp_gyp/googleurl.gyp:googleurl',
2052 '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
2052 '../testing/gtest.gyp:gtest', 2053 '../testing/gtest.gyp:gtest',
2053 'net', 2054 'net',
2054 ], 2055 ],
2055 'export_dependent_settings': [ 2056 'export_dependent_settings': [
2056 '../base/base.gyp:base', 2057 '../base/base.gyp:base',
2057 '../base/base.gyp:test_support_base', 2058 '../base/base.gyp:test_support_base',
2058 '../testing/gtest.gyp:gtest', 2059 '../testing/gtest.gyp:gtest',
2059 ], 2060 ],
2060 'sources': [ 2061 'sources': [
2061 'base/capturing_net_log.cc', 2062 'base/capturing_net_log.cc',
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
2422 ], 2423 ],
2423 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2424 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2424 'msvs_disabled_warnings': [4267, ], 2425 'msvs_disabled_warnings': [4267, ],
2425 }, 2426 },
2426 { 2427 {
2427 'target_name': 'tld_cleanup', 2428 'target_name': 'tld_cleanup',
2428 'type': 'executable', 2429 'type': 'executable',
2429 'dependencies': [ 2430 'dependencies': [
2430 '../base/base.gyp:base', 2431 '../base/base.gyp:base',
2431 '../base/base.gyp:base_i18n', 2432 '../base/base.gyp:base_i18n',
2432 '../build/temp_gyp/googleurl.gyp:googleurl', 2433 '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
2433 ], 2434 ],
2434 'sources': [ 2435 'sources': [
2435 'tools/tld_cleanup/tld_cleanup.cc', 2436 'tools/tld_cleanup/tld_cleanup.cc',
2436 ], 2437 ],
2437 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2438 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2438 'msvs_disabled_warnings': [4267, ], 2439 'msvs_disabled_warnings': [4267, ],
2439 }, 2440 },
2440 ], 2441 ],
2441 }], 2442 }],
2442 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 2443 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
2818 '--result', '<@(_outputs)', 2819 '--result', '<@(_outputs)',
2819 '--isolate', 'net_unittests.isolate', 2820 '--isolate', 'net_unittests.isolate',
2820 ], 2821 ],
2821 }, 2822 },
2822 ], 2823 ],
2823 }, 2824 },
2824 ], 2825 ],
2825 }], 2826 }],
2826 ], 2827 ],
2827 } 2828 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698