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

Side by Side Diff: net/net.gyp

Issue 10874077: net: Add a new target 'net_with_v8'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang? Created 8 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 'proxy/proxy_resolver.h', 582 'proxy/proxy_resolver.h',
583 'proxy/proxy_resolver_error_observer.h', 583 'proxy/proxy_resolver_error_observer.h',
584 'proxy/proxy_resolver_js_bindings.cc', 584 'proxy/proxy_resolver_js_bindings.cc',
585 'proxy/proxy_resolver_js_bindings.h', 585 'proxy/proxy_resolver_js_bindings.h',
586 'proxy/proxy_resolver_mac.cc', 586 'proxy/proxy_resolver_mac.cc',
587 'proxy/proxy_resolver_mac.h', 587 'proxy/proxy_resolver_mac.h',
588 'proxy/proxy_resolver_request_context.h', 588 'proxy/proxy_resolver_request_context.h',
589 'proxy/proxy_resolver_script.h', 589 'proxy/proxy_resolver_script.h',
590 'proxy/proxy_resolver_script_data.cc', 590 'proxy/proxy_resolver_script_data.cc',
591 'proxy/proxy_resolver_script_data.h', 591 'proxy/proxy_resolver_script_data.h',
592 'proxy/proxy_resolver_v8.cc',
593 'proxy/proxy_resolver_v8.h',
594 'proxy/proxy_resolver_winhttp.cc', 592 'proxy/proxy_resolver_winhttp.cc',
595 'proxy/proxy_resolver_winhttp.h', 593 'proxy/proxy_resolver_winhttp.h',
596 'proxy/proxy_retry_info.h', 594 'proxy/proxy_retry_info.h',
597 'proxy/proxy_script_decider.cc', 595 'proxy/proxy_script_decider.cc',
598 'proxy/proxy_script_decider.h', 596 'proxy/proxy_script_decider.h',
599 'proxy/proxy_script_fetcher.h', 597 'proxy/proxy_script_fetcher.h',
600 'proxy/proxy_script_fetcher_impl.cc', 598 'proxy/proxy_script_fetcher_impl.cc',
601 'proxy/proxy_script_fetcher_impl.h', 599 'proxy/proxy_script_fetcher_impl.h',
602 'proxy/proxy_server.cc', 600 'proxy/proxy_server.cc',
603 'proxy/proxy_server.h', 601 'proxy/proxy_server.h',
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 'websockets/websocket_throttle.cc', 811 'websockets/websocket_throttle.cc',
814 'websockets/websocket_throttle.h', 812 'websockets/websocket_throttle.h',
815 ], 813 ],
816 'defines': [ 814 'defines': [
817 'NET_IMPLEMENTATION', 815 'NET_IMPLEMENTATION',
818 ], 816 ],
819 'export_dependent_settings': [ 817 'export_dependent_settings': [
820 '../base/base.gyp:base', 818 '../base/base.gyp:base',
821 ], 819 ],
822 'conditions': [ 820 'conditions': [
823 ['OS != "ios"', {
824 'dependencies': [
825 # The v8 gyp file is not available in the iOS tree.
826 '../v8/tools/gyp/v8.gyp:v8',
827 ],
828 }],
829 ['chromeos==1', { 821 ['chromeos==1', {
830 'sources!': [ 822 'sources!': [
831 'base/network_change_notifier_linux.cc', 823 'base/network_change_notifier_linux.cc',
832 'base/network_change_notifier_linux.h', 824 'base/network_change_notifier_linux.h',
833 'base/network_change_notifier_netlink_linux.cc', 825 'base/network_change_notifier_netlink_linux.cc',
834 'base/network_change_notifier_netlink_linux.h', 826 'base/network_change_notifier_netlink_linux.h',
835 'proxy/proxy_config_service_linux.cc', 827 'proxy/proxy_config_service_linux.cc',
836 'proxy/proxy_config_service_linux.h', 828 'proxy/proxy_config_service_linux.h',
837 ], 829 ],
838 }], 830 }],
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 ['OS == "ios"', { 1107 ['OS == "ios"', {
1116 'sources/': [ 1108 'sources/': [
1117 ['include', 'base/network_change_notifier_mac\\.cc$'], 1109 ['include', 'base/network_change_notifier_mac\\.cc$'],
1118 ['include', 'base/network_config_watcher_mac\\.cc$'], 1110 ['include', 'base/network_config_watcher_mac\\.cc$'],
1119 ['include', 'base/platform_mime_util_mac\\.mm$'], 1111 ['include', 'base/platform_mime_util_mac\\.mm$'],
1120 ], 1112 ],
1121 }], 1113 }],
1122 ], 1114 ],
1123 }, 1115 },
1124 { 1116 {
1117 'target_name': 'net_with_v8',
1118 'type': '<(component)',
1119 'variables': { 'enable_wexit_time_destructors': 1, },
1120 'dependencies': [ 'net' ],
1121 'sources': [
1122 'proxy/proxy_resolver_v8.cc',
1123 'proxy/proxy_resolver_v8.h',
1124 'proxy/proxy_service_v8.cc',
1125 'proxy/proxy_service_v8.h',
1126 ],
1127 'conditions': [
1128 ['OS != "ios"',
1129 {
1130 'dependencies': [
1131 # The v8 gyp file is not available in the iOS tree.
1132 '../v8/tools/gyp/v8.gyp:v8',
1133 ],
1134 }
1135 ],
1136 ],
1137 },
1138 {
1125 'target_name': 'net_unittests', 1139 'target_name': 'net_unittests',
1126 'type': '<(gtest_target_type)', 1140 'type': '<(gtest_target_type)',
1127 'dependencies': [ 1141 'dependencies': [
1128 '../base/base.gyp:base', 1142 '../base/base.gyp:base',
1129 '../base/base.gyp:base_i18n', 1143 '../base/base.gyp:base_i18n',
1130 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 1144 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
1131 '../build/temp_gyp/googleurl.gyp:googleurl', 1145 '../build/temp_gyp/googleurl.gyp:googleurl',
1132 '../testing/gmock.gyp:gmock', 1146 '../testing/gmock.gyp:gmock',
1133 '../testing/gtest.gyp:gtest', 1147 '../testing/gtest.gyp:gtest',
1134 '../third_party/zlib/zlib.gyp:zlib', 1148 '../third_party/zlib/zlib.gyp:zlib',
1135 'net', 1149 'net',
1136 'net_test_support', 1150 'net_test_support',
1151 'net_with_v8',
1137 ], 1152 ],
1138 'sources': [ 1153 'sources': [
1139 'base/address_list_unittest.cc', 1154 'base/address_list_unittest.cc',
1140 'base/address_tracker_linux_unittest.cc', 1155 'base/address_tracker_linux_unittest.cc',
1141 'base/backoff_entry_unittest.cc', 1156 'base/backoff_entry_unittest.cc',
1142 'base/big_endian_unittest.cc', 1157 'base/big_endian_unittest.cc',
1143 'base/cert_database_nss_unittest.cc', 1158 'base/cert_database_nss_unittest.cc',
1144 'base/cert_verify_proc_unittest.cc', 1159 'base/cert_verify_proc_unittest.cc',
1145 'base/crl_set_unittest.cc', 1160 'base/crl_set_unittest.cc',
1146 'base/data_url_unittest.cc', 1161 'base/data_url_unittest.cc',
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 }, 1531 },
1517 { 1532 {
1518 'target_name': 'net_perftests', 1533 'target_name': 'net_perftests',
1519 'type': 'executable', 1534 'type': 'executable',
1520 'dependencies': [ 1535 'dependencies': [
1521 '../base/base.gyp:base', 1536 '../base/base.gyp:base',
1522 '../base/base.gyp:base_i18n', 1537 '../base/base.gyp:base_i18n',
1523 '../base/base.gyp:test_support_perf', 1538 '../base/base.gyp:test_support_perf',
1524 '../build/temp_gyp/googleurl.gyp:googleurl', 1539 '../build/temp_gyp/googleurl.gyp:googleurl',
1525 '../testing/gtest.gyp:gtest', 1540 '../testing/gtest.gyp:gtest',
1526 'net',
1527 'net_test_support', 1541 'net_test_support',
1542 'net_with_v8',
1528 ], 1543 ],
1529 'sources': [ 1544 'sources': [
1530 'cookies/cookie_monster_perftest.cc', 1545 'cookies/cookie_monster_perftest.cc',
1531 'disk_cache/disk_cache_perftest.cc', 1546 'disk_cache/disk_cache_perftest.cc',
1532 'proxy/proxy_resolver_perftest.cc', 1547 'proxy/proxy_resolver_perftest.cc',
1533 ], 1548 ],
1534 'conditions': [ 1549 'conditions': [
1535 # This is needed to trigger the dll copy step on windows. 1550 # This is needed to trigger the dll copy step on windows.
1536 # TODO(mark): Specifying this here shouldn't be necessary. 1551 # TODO(mark): Specifying this here shouldn't be necessary.
1537 [ 'OS == "win"', { 1552 [ 'OS == "win"', {
(...skipping 14 matching lines...) Expand all
1552 }], 1567 }],
1553 ], 1568 ],
1554 }, 1569 },
1555 { 1570 {
1556 'target_name': 'net_test_support', 1571 'target_name': 'net_test_support',
1557 'type': 'static_library', 1572 'type': 'static_library',
1558 'dependencies': [ 1573 'dependencies': [
1559 '../base/base.gyp:base', 1574 '../base/base.gyp:base',
1560 '../base/base.gyp:test_support_base', 1575 '../base/base.gyp:test_support_base',
1561 '../testing/gtest.gyp:gtest', 1576 '../testing/gtest.gyp:gtest',
1562 'net', 1577 'net_with_v8',
1563 ], 1578 ],
1564 'export_dependent_settings': [ 1579 'export_dependent_settings': [
1565 '../base/base.gyp:base', 1580 '../base/base.gyp:base',
1566 '../base/base.gyp:test_support_base', 1581 '../base/base.gyp:test_support_base',
1567 '../testing/gtest.gyp:gtest', 1582 '../testing/gtest.gyp:gtest',
1568 ], 1583 ],
1569 'sources': [ 1584 'sources': [
1570 'base/capturing_net_log.cc', 1585 'base/capturing_net_log.cc',
1571 'base/capturing_net_log.h', 1586 'base/capturing_net_log.h',
1572 'base/cert_test_util.cc', 1587 'base/cert_test_util.cc',
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1752 { 1767 {
1753 'target_name': 'fetch_client', 1768 'target_name': 'fetch_client',
1754 'type': 'executable', 1769 'type': 'executable',
1755 'variables': { 'enable_wexit_time_destructors': 1, }, 1770 'variables': { 'enable_wexit_time_destructors': 1, },
1756 'dependencies': [ 1771 'dependencies': [
1757 '../base/base.gyp:base', 1772 '../base/base.gyp:base',
1758 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 1773 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
1759 '../build/temp_gyp/googleurl.gyp:googleurl', 1774 '../build/temp_gyp/googleurl.gyp:googleurl',
1760 '../testing/gtest.gyp:gtest', 1775 '../testing/gtest.gyp:gtest',
1761 'net', 1776 'net',
1777 'net_with_v8',
1762 ], 1778 ],
1763 'sources': [ 1779 'sources': [
1764 'tools/fetch/fetch_client.cc', 1780 'tools/fetch/fetch_client.cc',
1765 ], 1781 ],
1766 }, 1782 },
1767 { 1783 {
1768 'target_name': 'fetch_server', 1784 'target_name': 'fetch_server',
1769 'type': 'executable', 1785 'type': 'executable',
1770 'variables': { 'enable_wexit_time_destructors': 1, }, 1786 'variables': { 'enable_wexit_time_destructors': 1, },
1771 'dependencies': [ 1787 'dependencies': [
(...skipping 26 matching lines...) Expand all
1798 'tools/gdig/file_net_log.cc', 1814 'tools/gdig/file_net_log.cc',
1799 'tools/gdig/gdig.cc', 1815 'tools/gdig/gdig.cc',
1800 ], 1816 ],
1801 }, 1817 },
1802 { 1818 {
1803 'target_name': 'net_watcher', 1819 'target_name': 'net_watcher',
1804 'type': 'executable', 1820 'type': 'executable',
1805 'dependencies': [ 1821 'dependencies': [
1806 '../base/base.gyp:base', 1822 '../base/base.gyp:base',
1807 'net', 1823 'net',
1824 'net_with_v8',
1808 ], 1825 ],
1809 'sources': [ 1826 'sources': [
1810 'tools/net_watcher/net_watcher.cc', 1827 'tools/net_watcher/net_watcher.cc',
1811 ], 1828 ],
1812 }, 1829 },
1813 { 1830 {
1814 'target_name': 'run_testserver', 1831 'target_name': 'run_testserver',
1815 'type': 'executable', 1832 'type': 'executable',
1816 'dependencies': [ 1833 'dependencies': [
1817 '../base/base.gyp:base', 1834 '../base/base.gyp:base',
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2098 '--result', '<@(_outputs)', 2115 '--result', '<@(_outputs)',
2099 '--isolate', 'net_unittests.isolate', 2116 '--isolate', 'net_unittests.isolate',
2100 ], 2117 ],
2101 }, 2118 },
2102 ], 2119 ],
2103 }, 2120 },
2104 ], 2121 ],
2105 }], 2122 }],
2106 ], 2123 ],
2107 } 2124 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | net/proxy/proxy_service.h » ('j') | net/proxy/proxy_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698