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

Side by Side Diff: net/net.gyp

Issue 502353002: Move WebSocket masking benchmarks to net_perftests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indentation in net.gyp. 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 | « no previous file | net/websockets/README » ('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 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 '../base/base.gyp:test_support_perf', 844 '../base/base.gyp:test_support_perf',
845 '../testing/gtest.gyp:gtest', 845 '../testing/gtest.gyp:gtest',
846 '../url/url.gyp:url_lib', 846 '../url/url.gyp:url_lib',
847 'net', 847 'net',
848 'net_test_support', 848 'net_test_support',
849 ], 849 ],
850 'sources': [ 850 'sources': [
851 'cookies/cookie_monster_perftest.cc', 851 'cookies/cookie_monster_perftest.cc',
852 'disk_cache/blockfile/disk_cache_perftest.cc', 852 'disk_cache/blockfile/disk_cache_perftest.cc',
853 'proxy/proxy_resolver_perftest.cc', 853 'proxy/proxy_resolver_perftest.cc',
854 'websockets/websocket_frame_perftest.cc',
854 ], 855 ],
855 'conditions': [ 856 'conditions': [
856 [ 'use_v8_in_net==1', { 857 [ 'use_v8_in_net==1', {
857 'dependencies': [ 858 'dependencies': [
858 'net_with_v8', 859 'net_with_v8',
859 ], 860 ],
860 }, { # else: !use_v8_in_net 861 }, { # else: !use_v8_in_net
861 'sources!': [ 862 'sources!': [
862 'proxy/proxy_resolver_perftest.cc', 863 'proxy/proxy_resolver_perftest.cc',
863 ], 864 ],
864 }, 865 },
865 ], 866 ],
866 [ 'OS == "win"', { 867 [ 'OS == "win"', {
867 'conditions': [ 868 'conditions': [
868 [ 'icu_use_data_file_flag == 0', { 869 [ 'icu_use_data_file_flag == 0', {
869 # This is needed to trigger the dll copy step on windows. 870 # This is needed to trigger the dll copy step on windows.
870 # TODO(mark): Specifying this here shouldn't be necessary. 871 # TODO(mark): Specifying this here shouldn't be necessary.
871 'dependencies': [ 872 'dependencies': [
872 '../third_party/icu/icu.gyp:icudata', 873 '../third_party/icu/icu.gyp:icudata',
873 ], 874 ],
874 }], 875 }],
875 ], 876 ],
876 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 877 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
877 'msvs_disabled_warnings': [4267, ], 878 'msvs_disabled_warnings': [4267, ],
878 }], 879 }],
880 [ 'enable_websockets != 1', {
881 'sources!': [
882 'websockets/websocket_frame_perftest.cc',
883 ],
884 }],
879 ], 885 ],
880 }, 886 },
881 { 887 {
882 'target_name': 'net_test_support', 888 'target_name': 'net_test_support',
883 'type': 'static_library', 889 'type': 'static_library',
884 'dependencies': [ 890 'dependencies': [
885 '../base/base.gyp:base', 891 '../base/base.gyp:base',
886 '../base/base.gyp:test_support_base', 892 '../base/base.gyp:test_support_base',
887 '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util', 893 '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
888 '../testing/gtest.gyp:gtest', 894 '../testing/gtest.gyp:gtest',
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 'net_unittests.isolate', 1717 'net_unittests.isolate',
1712 ], 1718 ],
1713 'sources': [ 1719 'sources': [
1714 'net_unittests.isolate', 1720 'net_unittests.isolate',
1715 ], 1721 ],
1716 }, 1722 },
1717 ], 1723 ],
1718 }], 1724 }],
1719 ], 1725 ],
1720 } 1726 }
OLDNEW
« no previous file with comments | « no previous file | net/websockets/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698