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

Side by Side Diff: net/net.gyp

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 years, 6 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
« no previous file with comments | « media/media.gyp ('k') | net/tools/tld_cleanup/tld_cleanup.gyp » ('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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 ], 44 ],
45 'targets': [ 45 'targets': [
46 { 46 {
47 'target_name': 'net', 47 'target_name': 'net',
48 'type': '<(component)', 48 'type': '<(component)',
49 'variables': { 'enable_wexit_time_destructors': 1, }, 49 'variables': { 'enable_wexit_time_destructors': 1, },
50 'dependencies': [ 50 'dependencies': [
51 '../base/base.gyp:base', 51 '../base/base.gyp:base',
52 '../base/base.gyp:base_i18n', 52 '../base/base.gyp:base_i18n',
53 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 53 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
54 '../build/temp_gyp/googleurl.gyp:googleurl',
55 '../crypto/crypto.gyp:crypto', 54 '../crypto/crypto.gyp:crypto',
56 '../sdch/sdch.gyp:sdch', 55 '../sdch/sdch.gyp:sdch',
57 '../third_party/icu/icu.gyp:icui18n', 56 '../third_party/icu/icu.gyp:icui18n',
58 '../third_party/icu/icu.gyp:icuuc', 57 '../third_party/icu/icu.gyp:icuuc',
59 '../third_party/zlib/zlib.gyp:zlib', 58 '../third_party/zlib/zlib.gyp:zlib',
59 '../url/url.gyp:url_lib',
60 'net_resources', 60 'net_resources',
61 ], 61 ],
62 'sources': [ 62 'sources': [
63 'android/cert_verify_result_android.h', 63 'android/cert_verify_result_android.h',
64 'android/cert_verify_result_android_list.h', 64 'android/cert_verify_result_android_list.h',
65 'android/gurl_utils.cc', 65 'android/gurl_utils.cc',
66 'android/gurl_utils.h', 66 'android/gurl_utils.h',
67 'android/keystore.cc', 67 'android/keystore.cc',
68 'android/keystore.h', 68 'android/keystore.h',
69 'android/keystore_openssl.cc', 69 'android/keystore_openssl.cc',
(...skipping 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 }], 1442 }],
1443 ], 1443 ],
1444 }, 1444 },
1445 { 1445 {
1446 'target_name': 'net_unittests', 1446 'target_name': 'net_unittests',
1447 'type': '<(gtest_target_type)', 1447 'type': '<(gtest_target_type)',
1448 'dependencies': [ 1448 'dependencies': [
1449 '../base/base.gyp:base', 1449 '../base/base.gyp:base',
1450 '../base/base.gyp:base_i18n', 1450 '../base/base.gyp:base_i18n',
1451 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 1451 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
1452 '../build/temp_gyp/googleurl.gyp:googleurl',
1453 '../crypto/crypto.gyp:crypto', 1452 '../crypto/crypto.gyp:crypto',
1454 '../testing/gmock.gyp:gmock', 1453 '../testing/gmock.gyp:gmock',
1455 '../testing/gtest.gyp:gtest', 1454 '../testing/gtest.gyp:gtest',
1456 '../third_party/zlib/zlib.gyp:zlib', 1455 '../third_party/zlib/zlib.gyp:zlib',
1456 '../url/url.gyp:url_lib',
1457 'net', 1457 'net',
1458 'net_test_support', 1458 'net_test_support',
1459 ], 1459 ],
1460 'sources': [ 1460 'sources': [
1461 'android/keystore_unittest.cc', 1461 'android/keystore_unittest.cc',
1462 'android/network_change_notifier_android_unittest.cc', 1462 'android/network_change_notifier_android_unittest.cc',
1463 'base/address_list_unittest.cc', 1463 'base/address_list_unittest.cc',
1464 'base/address_tracker_linux_unittest.cc', 1464 'base/address_tracker_linux_unittest.cc',
1465 'base/backoff_entry_unittest.cc', 1465 'base/backoff_entry_unittest.cc',
1466 'base/big_endian_unittest.cc', 1466 'base/big_endian_unittest.cc',
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
2067 }], 2067 }],
2068 ], 2068 ],
2069 }, 2069 },
2070 { 2070 {
2071 'target_name': 'net_perftests', 2071 'target_name': 'net_perftests',
2072 'type': 'executable', 2072 'type': 'executable',
2073 'dependencies': [ 2073 'dependencies': [
2074 '../base/base.gyp:base', 2074 '../base/base.gyp:base',
2075 '../base/base.gyp:base_i18n', 2075 '../base/base.gyp:base_i18n',
2076 '../base/base.gyp:test_support_perf', 2076 '../base/base.gyp:test_support_perf',
2077 '../build/temp_gyp/googleurl.gyp:googleurl',
2078 '../testing/gtest.gyp:gtest', 2077 '../testing/gtest.gyp:gtest',
2078 '../url/url.gyp:url_lib',
2079 'net', 2079 'net',
2080 'net_test_support', 2080 'net_test_support',
2081 ], 2081 ],
2082 'sources': [ 2082 'sources': [
2083 'cookies/cookie_monster_perftest.cc', 2083 'cookies/cookie_monster_perftest.cc',
2084 'disk_cache/disk_cache_perftest.cc', 2084 'disk_cache/disk_cache_perftest.cc',
2085 'proxy/proxy_resolver_perftest.cc', 2085 'proxy/proxy_resolver_perftest.cc',
2086 ], 2086 ],
2087 'conditions': [ 2087 'conditions': [
2088 [ 'use_v8_in_net==1', { 2088 [ 'use_v8_in_net==1', {
(...skipping 17 matching lines...) Expand all
2106 }, 2106 },
2107 ], 2107 ],
2108 ], 2108 ],
2109 }, 2109 },
2110 { 2110 {
2111 'target_name': 'net_test_support', 2111 'target_name': 'net_test_support',
2112 'type': 'static_library', 2112 'type': 'static_library',
2113 'dependencies': [ 2113 'dependencies': [
2114 '../base/base.gyp:base', 2114 '../base/base.gyp:base',
2115 '../base/base.gyp:test_support_base', 2115 '../base/base.gyp:test_support_base',
2116 '../build/temp_gyp/googleurl.gyp:googleurl',
2117 '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util', 2116 '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
2118 '../testing/gtest.gyp:gtest', 2117 '../testing/gtest.gyp:gtest',
2118 '../url/url.gyp:url_lib',
2119 'net', 2119 'net',
2120 ], 2120 ],
2121 'export_dependent_settings': [ 2121 'export_dependent_settings': [
2122 '../base/base.gyp:base', 2122 '../base/base.gyp:base',
2123 '../base/base.gyp:test_support_base', 2123 '../base/base.gyp:test_support_base',
2124 '../testing/gtest.gyp:gtest', 2124 '../testing/gtest.gyp:gtest',
2125 ], 2125 ],
2126 'sources': [ 2126 'sources': [
2127 'base/capturing_net_log.cc', 2127 'base/capturing_net_log.cc',
2128 'base/capturing_net_log.h', 2128 'base/capturing_net_log.h',
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2308 ], 2308 ],
2309 'conditions': [ 2309 'conditions': [
2310 ['use_v8_in_net == 1', { 2310 ['use_v8_in_net == 1', {
2311 'targets': [ 2311 'targets': [
2312 { 2312 {
2313 'target_name': 'net_with_v8', 2313 'target_name': 'net_with_v8',
2314 'type': '<(component)', 2314 'type': '<(component)',
2315 'variables': { 'enable_wexit_time_destructors': 1, }, 2315 'variables': { 'enable_wexit_time_destructors': 1, },
2316 'dependencies': [ 2316 'dependencies': [
2317 '../base/base.gyp:base', 2317 '../base/base.gyp:base',
2318 '../build/temp_gyp/googleurl.gyp:googleurl', 2318 '../url/url.gyp:url_lib',
2319 '../v8/tools/gyp/v8.gyp:v8', 2319 '../v8/tools/gyp/v8.gyp:v8',
2320 'net' 2320 'net'
2321 ], 2321 ],
2322 'defines': [ 2322 'defines': [
2323 'NET_IMPLEMENTATION', 2323 'NET_IMPLEMENTATION',
2324 ], 2324 ],
2325 'sources': [ 2325 'sources': [
2326 'proxy/proxy_resolver_v8.cc', 2326 'proxy/proxy_resolver_v8.cc',
2327 'proxy/proxy_resolver_v8.h', 2327 'proxy/proxy_resolver_v8.h',
2328 'proxy/proxy_resolver_v8_tracing.cc', 2328 'proxy/proxy_resolver_v8_tracing.cc',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
2379 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2379 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2380 'msvs_disabled_warnings': [4267, ], 2380 'msvs_disabled_warnings': [4267, ],
2381 }, 2381 },
2382 { 2382 {
2383 'target_name': 'fetch_client', 2383 'target_name': 'fetch_client',
2384 'type': 'executable', 2384 'type': 'executable',
2385 'variables': { 'enable_wexit_time_destructors': 1, }, 2385 'variables': { 'enable_wexit_time_destructors': 1, },
2386 'dependencies': [ 2386 'dependencies': [
2387 '../base/base.gyp:base', 2387 '../base/base.gyp:base',
2388 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 2388 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
2389 '../build/temp_gyp/googleurl.gyp:googleurl',
2390 '../testing/gtest.gyp:gtest', 2389 '../testing/gtest.gyp:gtest',
2390 '../url/url.gyp:url_lib',
2391 'net', 2391 'net',
2392 'net_with_v8', 2392 'net_with_v8',
2393 ], 2393 ],
2394 'sources': [ 2394 'sources': [
2395 'tools/fetch/fetch_client.cc', 2395 'tools/fetch/fetch_client.cc',
2396 ], 2396 ],
2397 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2397 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2398 'msvs_disabled_warnings': [4267, ], 2398 'msvs_disabled_warnings': [4267, ],
2399 }, 2399 },
2400 { 2400 {
2401 'target_name': 'fetch_server', 2401 'target_name': 'fetch_server',
2402 'type': 'executable', 2402 'type': 'executable',
2403 'variables': { 'enable_wexit_time_destructors': 1, }, 2403 'variables': { 'enable_wexit_time_destructors': 1, },
2404 'dependencies': [ 2404 'dependencies': [
2405 '../base/base.gyp:base', 2405 '../base/base.gyp:base',
2406 '../build/temp_gyp/googleurl.gyp:googleurl', 2406 '../url/url.gyp:url_lib',
2407 'net', 2407 'net',
2408 ], 2408 ],
2409 'sources': [ 2409 'sources': [
2410 'tools/fetch/fetch_server.cc', 2410 'tools/fetch/fetch_server.cc',
2411 'tools/fetch/http_listen_socket.cc', 2411 'tools/fetch/http_listen_socket.cc',
2412 'tools/fetch/http_listen_socket.h', 2412 'tools/fetch/http_listen_socket.h',
2413 'tools/fetch/http_server.cc', 2413 'tools/fetch/http_server.cc',
2414 'tools/fetch/http_server.h', 2414 'tools/fetch/http_server.h',
2415 'tools/fetch/http_server_request_info.cc', 2415 'tools/fetch/http_server_request_info.cc',
2416 'tools/fetch/http_server_request_info.h', 2416 'tools/fetch/http_server_request_info.h',
(...skipping 16 matching lines...) Expand all
2433 'tools/gdig/file_net_log.cc', 2433 'tools/gdig/file_net_log.cc',
2434 'tools/gdig/gdig.cc', 2434 'tools/gdig/gdig.cc',
2435 ], 2435 ],
2436 }, 2436 },
2437 { 2437 {
2438 'target_name': 'get_server_time', 2438 'target_name': 'get_server_time',
2439 'type': 'executable', 2439 'type': 'executable',
2440 'dependencies': [ 2440 'dependencies': [
2441 '../base/base.gyp:base', 2441 '../base/base.gyp:base',
2442 '../base/base.gyp:base_i18n', 2442 '../base/base.gyp:base_i18n',
2443 '../build/temp_gyp/googleurl.gyp:googleurl', 2443 '../url/url.gyp:url_lib',
2444 'net', 2444 'net',
2445 ], 2445 ],
2446 'sources': [ 2446 'sources': [
2447 'tools/get_server_time/get_server_time.cc', 2447 'tools/get_server_time/get_server_time.cc',
2448 ], 2448 ],
2449 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2449 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2450 'msvs_disabled_warnings': [4267, ], 2450 'msvs_disabled_warnings': [4267, ],
2451 }, 2451 },
2452 { 2452 {
2453 'target_name': 'net_watcher', 2453 'target_name': 'net_watcher',
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2588 'tools/flip_server/streamer_interface.cc', 2588 'tools/flip_server/streamer_interface.cc',
2589 'tools/flip_server/streamer_interface.h', 2589 'tools/flip_server/streamer_interface.h',
2590 'tools/flip_server/string_piece_utils.h', 2590 'tools/flip_server/string_piece_utils.h',
2591 ], 2591 ],
2592 }, 2592 },
2593 { 2593 {
2594 'target_name': 'quic_library', 2594 'target_name': 'quic_library',
2595 'type': 'static_library', 2595 'type': 'static_library',
2596 'dependencies': [ 2596 'dependencies': [
2597 '../base/base.gyp:base', 2597 '../base/base.gyp:base',
2598 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
2598 '../crypto/crypto.gyp:crypto', 2599 '../crypto/crypto.gyp:crypto',
2599 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
2600 '../build/temp_gyp/googleurl.gyp:googleurl',
2601 '../third_party/openssl/openssl.gyp:openssl', 2600 '../third_party/openssl/openssl.gyp:openssl',
2601 '../url/url.gyp:url_lib',
2602 'flip_balsa_and_epoll_library', 2602 'flip_balsa_and_epoll_library',
2603 'net', 2603 'net',
2604 ], 2604 ],
2605 'sources': [ 2605 'sources': [
2606 'tools/quic/quic_client.cc', 2606 'tools/quic/quic_client.cc',
2607 'tools/quic/quic_client.h', 2607 'tools/quic/quic_client.h',
2608 'tools/quic/quic_client_session.cc', 2608 'tools/quic/quic_client_session.cc',
2609 'tools/quic/quic_client_session.h', 2609 'tools/quic/quic_client_session.h',
2610 'tools/quic/quic_dispatcher.h', 2610 'tools/quic/quic_dispatcher.h',
2611 'tools/quic/quic_dispatcher.cc', 2611 'tools/quic/quic_dispatcher.cc',
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
2912 '--result', '<@(_outputs)', 2912 '--result', '<@(_outputs)',
2913 '--isolate', 'net_unittests.isolate', 2913 '--isolate', 'net_unittests.isolate',
2914 ], 2914 ],
2915 }, 2915 },
2916 ], 2916 ],
2917 }, 2917 },
2918 ], 2918 ],
2919 }], 2919 }],
2920 ], 2920 ],
2921 } 2921 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | net/tools/tld_cleanup/tld_cleanup.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698