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

Side by Side Diff: net/net.gyp

Issue 11830032: Make all net targets build on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 'socket/tcp_server_socket_libevent.h', 1160 'socket/tcp_server_socket_libevent.h',
1161 'udp/udp_socket_libevent.cc', 1161 'udp/udp_socket_libevent.cc',
1162 'udp/udp_socket_libevent.h', 1162 'udp/udp_socket_libevent.h',
1163 ], 1163 ],
1164 'dependencies': [ 1164 'dependencies': [
1165 '../third_party/nss/nss.gyp:nspr', 1165 '../third_party/nss/nss.gyp:nspr',
1166 '../third_party/nss/nss.gyp:nss', 1166 '../third_party/nss/nss.gyp:nss',
1167 'third_party/nss/ssl.gyp:libssl', 1167 'third_party/nss/ssl.gyp:libssl',
1168 'tld_cleanup', 1168 'tld_cleanup',
1169 ], 1169 ],
1170 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1171 'msvs_disabled_warnings': [4267, ],
cbentzel 2013/01/10 17:31:03 Can you provide a list of lines where compiler fai
jschuh 2013/01/10 17:39:42 Not practically speaking, because it's a massive l
1170 }, { # else: OS != "win" 1172 }, { # else: OS != "win"
1171 'sources!': [ 1173 'sources!': [
1172 'base/winsock_init.cc', 1174 'base/winsock_init.cc',
1173 'base/winsock_init.h', 1175 'base/winsock_init.h',
1174 'base/winsock_util.cc', 1176 'base/winsock_util.cc',
1175 'base/winsock_util.h', 1177 'base/winsock_util.h',
1176 'proxy/proxy_resolver_winhttp.cc', 1178 'proxy/proxy_resolver_winhttp.cc',
1177 'proxy/proxy_resolver_winhttp.h', 1179 'proxy/proxy_resolver_winhttp.h',
1178 ], 1180 ],
1179 }, 1181 },
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1682 'http/http_auth_gssapi_posix_unittest.cc', 1684 'http/http_auth_gssapi_posix_unittest.cc',
1683 ], 1685 ],
1684 # This is needed to trigger the dll copy step on windows. 1686 # This is needed to trigger the dll copy step on windows.
1685 # TODO(mark): Specifying this here shouldn't be necessary. 1687 # TODO(mark): Specifying this here shouldn't be necessary.
1686 'dependencies': [ 1688 'dependencies': [
1687 '../third_party/icu/icu.gyp:icudata', 1689 '../third_party/icu/icu.gyp:icudata',
1688 '../third_party/nss/nss.gyp:nspr', 1690 '../third_party/nss/nss.gyp:nspr',
1689 '../third_party/nss/nss.gyp:nss', 1691 '../third_party/nss/nss.gyp:nss',
1690 'third_party/nss/ssl.gyp:libssl', 1692 'third_party/nss/ssl.gyp:libssl',
1691 ], 1693 ],
1694 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1695 'msvs_disabled_warnings': [4267, ],
1692 }, 1696 },
1693 ], 1697 ],
1694 [ 'OS == "mac"', { 1698 [ 'OS == "mac"', {
1695 'dependencies': [ 1699 'dependencies': [
1696 '../third_party/nss/nss.gyp:nspr', 1700 '../third_party/nss/nss.gyp:nspr',
1697 '../third_party/nss/nss.gyp:nss', 1701 '../third_party/nss/nss.gyp:nss',
1698 'third_party/nss/ssl.gyp:libssl', 1702 'third_party/nss/ssl.gyp:libssl',
1699 ], 1703 ],
1700 }, 1704 },
1701 ], 1705 ],
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1814 'proxy/proxy_resolver_perftest.cc', 1818 'proxy/proxy_resolver_perftest.cc',
1815 ], 1819 ],
1816 }, 1820 },
1817 ], 1821 ],
1818 # This is needed to trigger the dll copy step on windows. 1822 # This is needed to trigger the dll copy step on windows.
1819 # TODO(mark): Specifying this here shouldn't be necessary. 1823 # TODO(mark): Specifying this here shouldn't be necessary.
1820 [ 'OS == "win"', { 1824 [ 'OS == "win"', {
1821 'dependencies': [ 1825 'dependencies': [
1822 '../third_party/icu/icu.gyp:icudata', 1826 '../third_party/icu/icu.gyp:icudata',
1823 ], 1827 ],
1828 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1829 'msvs_disabled_warnings': [4267, ],
1824 }, 1830 },
1825 ], 1831 ],
1826 ], 1832 ],
1827 }, 1833 },
1828 { 1834 {
1829 'target_name': 'net_test_support', 1835 'target_name': 'net_test_support',
1830 'type': 'static_library', 1836 'type': 'static_library',
1831 'dependencies': [ 1837 'dependencies': [
1832 '../base/base.gyp:base', 1838 '../base/base.gyp:base',
1833 '../base/base.gyp:test_support_base', 1839 '../base/base.gyp:test_support_base',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1945 '../third_party/nss/nss.gyp:nss', 1951 '../third_party/nss/nss.gyp:nss',
1946 ], 1952 ],
1947 }], 1953 }],
1948 [ 'use_v8_in_net==1', { 1954 [ 'use_v8_in_net==1', {
1949 'dependencies': [ 1955 'dependencies': [
1950 'net_with_v8', 1956 'net_with_v8',
1951 ], 1957 ],
1952 }, 1958 },
1953 ], 1959 ],
1954 ], 1960 ],
1961 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1962 'msvs_disabled_warnings': [4267, ],
1955 }, 1963 },
1956 { 1964 {
1957 'target_name': 'net_resources', 1965 'target_name': 'net_resources',
1958 'type': 'none', 1966 'type': 'none',
1959 'variables': { 1967 'variables': {
1960 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/net', 1968 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/net',
1961 }, 1969 },
1962 'actions': [ 1970 'actions': [
1963 { 1971 {
1964 'action_name': 'net_resources', 1972 'action_name': 'net_resources',
(...skipping 16 matching lines...) Expand all
1981 'sources': [ 1989 'sources': [
1982 'server/http_connection.cc', 1990 'server/http_connection.cc',
1983 'server/http_connection.h', 1991 'server/http_connection.h',
1984 'server/http_server.cc', 1992 'server/http_server.cc',
1985 'server/http_server.h', 1993 'server/http_server.h',
1986 'server/http_server_request_info.cc', 1994 'server/http_server_request_info.cc',
1987 'server/http_server_request_info.h', 1995 'server/http_server_request_info.h',
1988 'server/web_socket.cc', 1996 'server/web_socket.cc',
1989 'server/web_socket.h', 1997 'server/web_socket.h',
1990 ], 1998 ],
1999 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2000 'msvs_disabled_warnings': [4267, ],
1991 }, 2001 },
1992 { 2002 {
1993 'target_name': 'dump_cache', 2003 'target_name': 'dump_cache',
1994 'type': 'executable', 2004 'type': 'executable',
1995 'dependencies': [ 2005 'dependencies': [
1996 '../base/base.gyp:base', 2006 '../base/base.gyp:base',
1997 'net', 2007 'net',
1998 'net_test_support', 2008 'net_test_support',
1999 ], 2009 ],
2000 'sources': [ 2010 'sources': [
2001 'tools/dump_cache/cache_dumper.cc', 2011 'tools/dump_cache/cache_dumper.cc',
2002 'tools/dump_cache/cache_dumper.h', 2012 'tools/dump_cache/cache_dumper.h',
2003 'tools/dump_cache/dump_cache.cc', 2013 'tools/dump_cache/dump_cache.cc',
2004 'tools/dump_cache/dump_files.cc', 2014 'tools/dump_cache/dump_files.cc',
2005 'tools/dump_cache/dump_files.h', 2015 'tools/dump_cache/dump_files.h',
2006 'tools/dump_cache/simple_cache_dumper.cc', 2016 'tools/dump_cache/simple_cache_dumper.cc',
2007 'tools/dump_cache/simple_cache_dumper.h', 2017 'tools/dump_cache/simple_cache_dumper.h',
2008 'tools/dump_cache/upgrade_win.cc', 2018 'tools/dump_cache/upgrade_win.cc',
2009 'tools/dump_cache/upgrade_win.h', 2019 'tools/dump_cache/upgrade_win.h',
2010 'tools/dump_cache/url_to_filename_encoder.cc', 2020 'tools/dump_cache/url_to_filename_encoder.cc',
2011 'tools/dump_cache/url_to_filename_encoder.h', 2021 'tools/dump_cache/url_to_filename_encoder.h',
2012 'tools/dump_cache/url_utilities.h', 2022 'tools/dump_cache/url_utilities.h',
2013 'tools/dump_cache/url_utilities.cc', 2023 'tools/dump_cache/url_utilities.cc',
2014 ], 2024 ],
2025 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2026 'msvs_disabled_warnings': [4267, ],
2015 }, 2027 },
2016 ], 2028 ],
2017 'conditions': [ 2029 'conditions': [
2018 ['use_v8_in_net == 1', { 2030 ['use_v8_in_net == 1', {
2019 'targets': [ 2031 'targets': [
2020 { 2032 {
2021 'target_name': 'net_with_v8', 2033 'target_name': 'net_with_v8',
2022 'type': '<(component)', 2034 'type': '<(component)',
2023 'variables': { 'enable_wexit_time_destructors': 1, }, 2035 'variables': { 'enable_wexit_time_destructors': 1, },
2024 'dependencies': [ 2036 'dependencies': [
2025 '../base/base.gyp:base', 2037 '../base/base.gyp:base',
2026 '../build/temp_gyp/googleurl.gyp:googleurl', 2038 '../build/temp_gyp/googleurl.gyp:googleurl',
2027 '../v8/tools/gyp/v8.gyp:v8', 2039 '../v8/tools/gyp/v8.gyp:v8',
2028 'net' 2040 'net'
2029 ], 2041 ],
2030 'defines': [ 2042 'defines': [
2031 'NET_IMPLEMENTATION', 2043 'NET_IMPLEMENTATION',
2032 ], 2044 ],
2033 'sources': [ 2045 'sources': [
2034 'proxy/proxy_resolver_v8.cc', 2046 'proxy/proxy_resolver_v8.cc',
2035 'proxy/proxy_resolver_v8.h', 2047 'proxy/proxy_resolver_v8.h',
2036 'proxy/proxy_service_v8.cc', 2048 'proxy/proxy_service_v8.cc',
2037 'proxy/proxy_service_v8.h', 2049 'proxy/proxy_service_v8.h',
2038 ], 2050 ],
2051 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2052 'msvs_disabled_warnings': [4267, ],
2039 }, 2053 },
2040 ], 2054 ],
2041 }], 2055 }],
2042 ['OS != "ios"', { 2056 ['OS != "ios"', {
2043 'targets': [ 2057 'targets': [
2044 # iOS doesn't have the concept of simple executables, these targets 2058 # iOS doesn't have the concept of simple executables, these targets
2045 # can't be compiled on the platform. 2059 # can't be compiled on the platform.
2046 { 2060 {
2047 'target_name': 'crash_cache', 2061 'target_name': 'crash_cache',
2048 'type': 'executable', 2062 'type': 'executable',
2049 'dependencies': [ 2063 'dependencies': [
2050 '../base/base.gyp:base', 2064 '../base/base.gyp:base',
2051 'net', 2065 'net',
2052 'net_test_support', 2066 'net_test_support',
2053 ], 2067 ],
2054 'sources': [ 2068 'sources': [
2055 'tools/crash_cache/crash_cache.cc', 2069 'tools/crash_cache/crash_cache.cc',
2056 ], 2070 ],
2071 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2072 'msvs_disabled_warnings': [4267, ],
2057 }, 2073 },
2058 { 2074 {
2059 'target_name': 'crl_set_dump', 2075 'target_name': 'crl_set_dump',
2060 'type': 'executable', 2076 'type': 'executable',
2061 'dependencies': [ 2077 'dependencies': [
2062 '../base/base.gyp:base', 2078 '../base/base.gyp:base',
2063 'net', 2079 'net',
2064 ], 2080 ],
2065 'sources': [ 2081 'sources': [
2066 'tools/crl_set_dump/crl_set_dump.cc', 2082 'tools/crl_set_dump/crl_set_dump.cc',
2067 ], 2083 ],
2084 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2085 'msvs_disabled_warnings': [4267, ],
2068 }, 2086 },
2069 { 2087 {
2070 'target_name': 'dns_fuzz_stub', 2088 'target_name': 'dns_fuzz_stub',
2071 'type': 'executable', 2089 'type': 'executable',
2072 'dependencies': [ 2090 'dependencies': [
2073 '../base/base.gyp:base', 2091 '../base/base.gyp:base',
2074 'net', 2092 'net',
2075 ], 2093 ],
2076 'sources': [ 2094 'sources': [
2077 'tools/dns_fuzz_stub/dns_fuzz_stub.cc', 2095 'tools/dns_fuzz_stub/dns_fuzz_stub.cc',
2078 ], 2096 ],
2097 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2098 'msvs_disabled_warnings': [4267, ],
2079 }, 2099 },
2080 { 2100 {
2081 'target_name': 'fetch_client', 2101 'target_name': 'fetch_client',
2082 'type': 'executable', 2102 'type': 'executable',
2083 'variables': { 'enable_wexit_time_destructors': 1, }, 2103 'variables': { 'enable_wexit_time_destructors': 1, },
2084 'dependencies': [ 2104 'dependencies': [
2085 '../base/base.gyp:base', 2105 '../base/base.gyp:base',
2086 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 2106 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
2087 '../build/temp_gyp/googleurl.gyp:googleurl', 2107 '../build/temp_gyp/googleurl.gyp:googleurl',
2088 '../testing/gtest.gyp:gtest', 2108 '../testing/gtest.gyp:gtest',
2089 'net', 2109 'net',
2090 'net_with_v8', 2110 'net_with_v8',
2091 ], 2111 ],
2092 'sources': [ 2112 'sources': [
2093 'tools/fetch/fetch_client.cc', 2113 'tools/fetch/fetch_client.cc',
2094 ], 2114 ],
2115 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2116 'msvs_disabled_warnings': [4267, ],
2095 }, 2117 },
2096 { 2118 {
2097 'target_name': 'fetch_server', 2119 'target_name': 'fetch_server',
2098 'type': 'executable', 2120 'type': 'executable',
2099 'variables': { 'enable_wexit_time_destructors': 1, }, 2121 'variables': { 'enable_wexit_time_destructors': 1, },
2100 'dependencies': [ 2122 'dependencies': [
2101 '../base/base.gyp:base', 2123 '../base/base.gyp:base',
2102 '../build/temp_gyp/googleurl.gyp:googleurl', 2124 '../build/temp_gyp/googleurl.gyp:googleurl',
2103 'net', 2125 'net',
2104 ], 2126 ],
2105 'sources': [ 2127 'sources': [
2106 'tools/fetch/fetch_server.cc', 2128 'tools/fetch/fetch_server.cc',
2107 'tools/fetch/http_listen_socket.cc', 2129 'tools/fetch/http_listen_socket.cc',
2108 'tools/fetch/http_listen_socket.h', 2130 'tools/fetch/http_listen_socket.h',
2109 'tools/fetch/http_server.cc', 2131 'tools/fetch/http_server.cc',
2110 'tools/fetch/http_server.h', 2132 'tools/fetch/http_server.h',
2111 'tools/fetch/http_server_request_info.cc', 2133 'tools/fetch/http_server_request_info.cc',
2112 'tools/fetch/http_server_request_info.h', 2134 'tools/fetch/http_server_request_info.h',
2113 'tools/fetch/http_server_response_info.cc', 2135 'tools/fetch/http_server_response_info.cc',
2114 'tools/fetch/http_server_response_info.h', 2136 'tools/fetch/http_server_response_info.h',
2115 'tools/fetch/http_session.cc', 2137 'tools/fetch/http_session.cc',
2116 'tools/fetch/http_session.h', 2138 'tools/fetch/http_session.h',
2117 ], 2139 ],
2140 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2141 'msvs_disabled_warnings': [4267, ],
2118 }, 2142 },
2119 { 2143 {
2120 'target_name': 'gdig', 2144 'target_name': 'gdig',
2121 'type': 'executable', 2145 'type': 'executable',
2122 'dependencies': [ 2146 'dependencies': [
2123 '../base/base.gyp:base', 2147 '../base/base.gyp:base',
2124 'net', 2148 'net',
2125 ], 2149 ],
2126 'sources': [ 2150 'sources': [
2127 'tools/gdig/file_net_log.cc', 2151 'tools/gdig/file_net_log.cc',
2128 'tools/gdig/gdig.cc', 2152 'tools/gdig/gdig.cc',
2129 ], 2153 ],
2130 }, 2154 },
2131 { 2155 {
2132 'target_name': 'get_server_time', 2156 'target_name': 'get_server_time',
2133 'type': 'executable', 2157 'type': 'executable',
2134 'dependencies': [ 2158 'dependencies': [
2135 '../base/base.gyp:base', 2159 '../base/base.gyp:base',
2136 '../base/base.gyp:base_i18n', 2160 '../base/base.gyp:base_i18n',
2137 '../build/temp_gyp/googleurl.gyp:googleurl', 2161 '../build/temp_gyp/googleurl.gyp:googleurl',
2138 'net', 2162 'net',
2139 ], 2163 ],
2140 'sources': [ 2164 'sources': [
2141 'tools/get_server_time/get_server_time.cc', 2165 'tools/get_server_time/get_server_time.cc',
2142 ], 2166 ],
2167 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2168 'msvs_disabled_warnings': [4267, ],
2143 }, 2169 },
2144 { 2170 {
2145 'target_name': 'net_watcher', 2171 'target_name': 'net_watcher',
2146 'type': 'executable', 2172 'type': 'executable',
2147 'dependencies': [ 2173 'dependencies': [
2148 '../base/base.gyp:base', 2174 '../base/base.gyp:base',
2149 'net', 2175 'net',
2150 'net_with_v8', 2176 'net_with_v8',
2151 ], 2177 ],
2152 'conditions': [ 2178 'conditions': [
(...skipping 27 matching lines...) Expand all
2180 'target_name': 'stress_cache', 2206 'target_name': 'stress_cache',
2181 'type': 'executable', 2207 'type': 'executable',
2182 'dependencies': [ 2208 'dependencies': [
2183 '../base/base.gyp:base', 2209 '../base/base.gyp:base',
2184 'net', 2210 'net',
2185 'net_test_support', 2211 'net_test_support',
2186 ], 2212 ],
2187 'sources': [ 2213 'sources': [
2188 'disk_cache/stress_cache.cc', 2214 'disk_cache/stress_cache.cc',
2189 ], 2215 ],
2216 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2217 'msvs_disabled_warnings': [4267, ],
2190 }, 2218 },
2191 { 2219 {
2192 'target_name': 'tld_cleanup', 2220 'target_name': 'tld_cleanup',
2193 'type': 'executable', 2221 'type': 'executable',
2194 'dependencies': [ 2222 'dependencies': [
2195 '../base/base.gyp:base', 2223 '../base/base.gyp:base',
2196 '../base/base.gyp:base_i18n', 2224 '../base/base.gyp:base_i18n',
2197 '../build/temp_gyp/googleurl.gyp:googleurl', 2225 '../build/temp_gyp/googleurl.gyp:googleurl',
2198 ], 2226 ],
2199 'sources': [ 2227 'sources': [
2200 'tools/tld_cleanup/tld_cleanup.cc', 2228 'tools/tld_cleanup/tld_cleanup.cc',
2201 ], 2229 ],
2230 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2231 'msvs_disabled_warnings': [4267, ],
2202 }, 2232 },
2203 ], 2233 ],
2204 }], 2234 }],
2205 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 2235 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
2206 'targets': [ 2236 'targets': [
2207 { 2237 {
2208 'target_name': 'flip_in_mem_edsm_server', 2238 'target_name': 'flip_in_mem_edsm_server',
2209 'type': 'executable', 2239 'type': 'executable',
2210 'cflags': [ 2240 'cflags': [
2211 '-Wno-deprecated', 2241 '-Wno-deprecated',
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
2400 '--result', '<@(_outputs)', 2430 '--result', '<@(_outputs)',
2401 '--isolate', 'net_unittests.isolate', 2431 '--isolate', 'net_unittests.isolate',
2402 ], 2432 ],
2403 }, 2433 },
2404 ], 2434 ],
2405 }, 2435 },
2406 ], 2436 ],
2407 }], 2437 }],
2408 ], 2438 ],
2409 } 2439 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698