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

Side by Side Diff: net/net.gyp

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/interfaces/proxy_resolver_service.mojom ('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 'conditions': [ 10 'conditions': [
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 '../base/base.gyp:test_support_perf', 830 '../base/base.gyp:test_support_perf',
831 '../testing/gtest.gyp:gtest', 831 '../testing/gtest.gyp:gtest',
832 '../url/url.gyp:url_lib', 832 '../url/url.gyp:url_lib',
833 'net', 833 'net',
834 'net_test_support', 834 'net_test_support',
835 ], 835 ],
836 'sources': [ 836 'sources': [
837 'cookies/cookie_monster_perftest.cc', 837 'cookies/cookie_monster_perftest.cc',
838 'disk_cache/blockfile/disk_cache_perftest.cc', 838 'disk_cache/blockfile/disk_cache_perftest.cc',
839 'proxy/proxy_resolver_perftest.cc', 839 'proxy/proxy_resolver_perftest.cc',
840 'udp/udp_socket_perftest.cc',
840 'websockets/websocket_frame_perftest.cc', 841 'websockets/websocket_frame_perftest.cc',
841 ], 842 ],
842 'conditions': [ 843 'conditions': [
843 [ 'use_v8_in_net==1', { 844 [ 'use_v8_in_net==1', {
844 'dependencies': [ 845 'dependencies': [
845 'net_with_v8', 846 'net_with_v8',
846 ], 847 ],
847 }, { # else: !use_v8_in_net 848 }, { # else: !use_v8_in_net
848 'sources!': [ 849 'sources!': [
849 'proxy/proxy_resolver_perftest.cc', 850 'proxy/proxy_resolver_perftest.cc',
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 'proxy/proxy_resolver_v8_tracing.cc', 1197 'proxy/proxy_resolver_v8_tracing.cc',
1197 'proxy/proxy_resolver_v8_tracing.h', 1198 'proxy/proxy_resolver_v8_tracing.h',
1198 'proxy/proxy_service_v8.cc', 1199 'proxy/proxy_service_v8.cc',
1199 'proxy/proxy_service_v8.h', 1200 'proxy/proxy_service_v8.h',
1200 ], 1201 ],
1201 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1202 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1202 'msvs_disabled_warnings': [4267, ], 1203 'msvs_disabled_warnings': [4267, ],
1203 }, 1204 },
1204 ], 1205 ],
1205 }], 1206 }],
1207 ['use_v8_in_net == 1 and OS != "android"', {
1208 'targets': [
1209 {
1210 # GN version: //net/interfaces
1211 'target_name': 'net_interfaces',
1212 'type': 'static_library',
1213 'sources': [
1214 'interfaces/host_resolver_service.mojom',
1215 'interfaces/proxy_resolver_service.mojom',
1216 ],
1217 'includes': [
1218 '../third_party/mojo/mojom_bindings_generator.gypi',
1219 ],
1220 },
1221 ],
1222 }],
1206 ['OS != "ios" and OS != "android"', { 1223 ['OS != "ios" and OS != "android"', {
1207 'targets': [ 1224 'targets': [
1208 # iOS doesn't have the concept of simple executables, these targets 1225 # iOS doesn't have the concept of simple executables, these targets
1209 # can't be compiled on the platform. 1226 # can't be compiled on the platform.
1210 { 1227 {
1211 'target_name': 'crash_cache', 1228 'target_name': 'crash_cache',
1212 'type': 'executable', 1229 'type': 'executable',
1213 'dependencies': [ 1230 'dependencies': [
1214 '../base/base.gyp:base', 1231 '../base/base.gyp:base',
1215 'net', 1232 'net',
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
1749 '../build/isolate.gypi', 1766 '../build/isolate.gypi',
1750 ], 1767 ],
1751 'sources': [ 1768 'sources': [
1752 'net_unittests.isolate', 1769 'net_unittests.isolate',
1753 ], 1770 ],
1754 }, 1771 },
1755 ], 1772 ],
1756 }], 1773 }],
1757 ], 1774 ],
1758 } 1775 }
OLDNEW
« no previous file with comments | « net/interfaces/proxy_resolver_service.mojom ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698