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

Side by Side Diff: net/net.gyp

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: address comments Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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': [
11 ['chromeos==1', { 11 ['chromeos==1 or OS=="android"', {
12 # Disable Kerberos on ChromeOS, at least for now. 12 # Disable Kerberos on ChromeOS and Android, at least for now.
13 # It needs configuration (krb5.conf and so on). 13 # It needs configuration (krb5.conf and so on).
14 'use_kerberos%': 0, 14 'use_kerberos%': 0,
15 }, { # chromeos == 0 15 }, { # chromeos == 0
16 'use_kerberos%': 1, 16 'use_kerberos%': 1,
17 }], 17 }],
18 ], 18 ],
19 }, 19 },
20 'includes': [ 20 'includes': [
21 '../build/win_precompile.gypi', 21 '../build/win_precompile.gypi',
22 ], 22 ],
23 'targets': [ 23 'targets': [
24 { 24 {
25 'target_name': 'net', 25 'target_name': 'net',
26 'type': '<(component)', 26 'type': '<(component)',
27 'dependencies': [ 27 'dependencies': [
28 '../base/base.gyp:base', 28 '../base/base.gyp:base',
29 '../base/base.gyp:base_i18n', 29 '../base/base.gyp:base_i18n',
30 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 30 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
31 '../build/temp_gyp/googleurl.gyp:googleurl', 31 '../build/temp_gyp/googleurl.gyp:googleurl',
32 '../crypto/crypto.gyp:crypto', 32 '../crypto/crypto.gyp:crypto',
33 '../sdch/sdch.gyp:sdch', 33 '../sdch/sdch.gyp:sdch',
34 '../third_party/icu/icu.gyp:icui18n', 34 '../third_party/icu/icu.gyp:icui18n',
35 '../third_party/icu/icu.gyp:icuuc', 35 '../third_party/icu/icu.gyp:icuuc',
36 '../third_party/zlib/zlib.gyp:zlib', 36 '../third_party/zlib/zlib.gyp:zlib',
37 '../v8/tools/gyp/v8.gyp:v8', 37 '../v8/tools/gyp/v8.gyp:v8',
38 'net_resources', 38 'net_resources',
39 'ssl_false_start_blacklist_process#host', 39 'ssl_false_start_blacklist_process#host',
40 ], 40 ],
41 'sources': [ 41 'sources': [
42 'android/network_library.cc',
43 'android/network_library.h',
42 'base/address_family.h', 44 'base/address_family.h',
43 'base/address_list.cc', 45 'base/address_list.cc',
44 'base/address_list.h', 46 'base/address_list.h',
45 'base/address_list_net_log_param.cc', 47 'base/address_list_net_log_param.cc',
46 'base/address_list_net_log_param.h', 48 'base/address_list_net_log_param.h',
47 'base/asn1_util.cc', 49 'base/asn1_util.cc',
48 'base/asn1_util.h', 50 'base/asn1_util.h',
49 'base/auth.cc', 51 'base/auth.cc',
50 'base/auth.h', 52 'base/auth.h',
51 'base/backoff_entry.cc', 53 'base/backoff_entry.cc',
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 'base/network_change_notifier_win.cc', 177 'base/network_change_notifier_win.cc',
176 'base/network_change_notifier_win.h', 178 'base/network_change_notifier_win.h',
177 'base/network_config_watcher_mac.cc', 179 'base/network_config_watcher_mac.cc',
178 'base/network_config_watcher_mac.h', 180 'base/network_config_watcher_mac.h',
179 'base/network_delegate.cc', 181 'base/network_delegate.cc',
180 'base/network_delegate.h', 182 'base/network_delegate.h',
181 'base/nss_memio.c', 183 'base/nss_memio.c',
182 'base/nss_memio.h', 184 'base/nss_memio.h',
183 'base/openssl_memory_private_key_store.cc', 185 'base/openssl_memory_private_key_store.cc',
184 'base/openssl_private_key_store.h', 186 'base/openssl_private_key_store.h',
187 'base/openssl_private_key_store_android.cc',
185 'base/origin_bound_cert_service.cc', 188 'base/origin_bound_cert_service.cc',
186 'base/origin_bound_cert_service.h', 189 'base/origin_bound_cert_service.h',
187 'base/origin_bound_cert_store.h', 190 'base/origin_bound_cert_store.h',
188 'base/pem_tokenizer.cc', 191 'base/pem_tokenizer.cc',
189 'base/pem_tokenizer.h', 192 'base/pem_tokenizer.h',
190 'base/platform_mime_util.h', 193 'base/platform_mime_util.h',
191 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 194 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
192 'base/platform_mime_util_linux.cc', 195 'base/platform_mime_util_linux.cc',
193 'base/platform_mime_util_mac.cc', 196 'base/platform_mime_util_mac.cc',
194 'base/platform_mime_util_win.cc', 197 'base/platform_mime_util_win.cc',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 'base/winsock_util.cc', 241 'base/winsock_util.cc',
239 'base/winsock_util.h', 242 'base/winsock_util.h',
240 'base/x509_cert_types.cc', 243 'base/x509_cert_types.cc',
241 'base/x509_cert_types.h', 244 'base/x509_cert_types.h',
242 'base/x509_cert_types_mac.cc', 245 'base/x509_cert_types_mac.cc',
243 'base/x509_certificate.cc', 246 'base/x509_certificate.cc',
244 'base/x509_certificate.h', 247 'base/x509_certificate.h',
245 'base/x509_certificate_mac.cc', 248 'base/x509_certificate_mac.cc',
246 'base/x509_certificate_nss.cc', 249 'base/x509_certificate_nss.cc',
247 'base/x509_certificate_openssl.cc', 250 'base/x509_certificate_openssl.cc',
251 'base/x509_certificate_openssl_android.cc',
248 'base/x509_certificate_win.cc', 252 'base/x509_certificate_win.cc',
249 'base/x509_util.h', 253 'base/x509_util.h',
250 'base/x509_util_nss.cc', 254 'base/x509_util_nss.cc',
251 'base/x509_util_nss.h', 255 'base/x509_util_nss.h',
252 'base/x509_util_openssl.cc', 256 'base/x509_util_openssl.cc',
253 'base/x509_util_openssl.h', 257 'base/x509_util_openssl.h',
254 'base/zap.cc', 258 'base/zap.cc',
255 'base/zap.h', 259 'base/zap.h',
256 'disk_cache/addr.cc', 260 'disk_cache/addr.cc',
257 'disk_cache/addr.h', 261 'disk_cache/addr.h',
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 '$(SDKROOT)/usr/lib/libresolv.dylib', 924 '$(SDKROOT)/usr/lib/libresolv.dylib',
921 ] 925 ]
922 }, 926 },
923 }, 927 },
924 ], 928 ],
925 [ 'OS == "android"', { 929 [ 'OS == "android"', {
926 'defines': [ 930 'defines': [
927 # Android can shut down our app at any time, so we persist session cookies. 931 # Android can shut down our app at any time, so we persist session cookies.
928 'ENABLE_PERSISTENT_SESSION_COOKIES' 932 'ENABLE_PERSISTENT_SESSION_COOKIES'
929 ], 933 ],
934 'dependencies': [
935 '../build/android/system.gyp:ssl',
936 ],
937 'sources!': [
938 'dns/dns_config_service_posix.cc',
joth 2011/11/02 18:57:05 I see this service isn't actually used in chrome a
Jing Zhao 2011/11/03 17:49:08 Added it back with a few #if clauses.
939 ],
940 'sources/': [
941 # TODO(jingzhao): The below files are excluded because of the
942 # missing JNI, add them back when JNI is ready.
joth 2011/11/02 18:57:05 nit: missing JNI -> missing availability of JNI bi
943 ['exclude', '^android/'],
944 ],
930 }, { # else OS! = "android" 945 }, { # else OS! = "android"
931 'defines': [ 946 'defines': [
932 # These are the features Android doesn't support. 947 # These are the features Android doesn't support.
933 'ENABLE_MEDIA_CODEC_THEORA', 948 'ENABLE_MEDIA_CODEC_THEORA',
934 'ENABLE_MEDIA_TYPE_OGG', 949 'ENABLE_MEDIA_TYPE_OGG',
935 ], 950 ],
936 }, 951 },
937 ], 952 ],
938 ], 953 ],
954 'target_conditions': [
955 ['OS == "android"', {
956 'sources/': [
957 ['include', '^base/platform_mime_util_linux\\.cc$'],
958 ],
959 }],
960 ],
939 }, 961 },
940 { 962 {
941 'target_name': 'net_unittests', 963 'target_name': 'net_unittests',
942 'type': 'executable', 964 'type': 'executable',
943 'dependencies': [ 965 'dependencies': [
944 'net', 966 'net',
945 'net_test_support', 967 'net_test_support',
946 '../base/base.gyp:base', 968 '../base/base.gyp:base',
947 '../base/base.gyp:base_i18n', 969 '../base/base.gyp:base_i18n',
948 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 970 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
1155 'base/cert_database_nss_unittest.cc', 1177 'base/cert_database_nss_unittest.cc',
1156 ], 1178 ],
1157 }, 1179 },
1158 ], 1180 ],
1159 [ 'toolkit_uses_gtk == 1', { 1181 [ 'toolkit_uses_gtk == 1', {
1160 'dependencies': [ 1182 'dependencies': [
1161 '../build/linux/system.gyp:gtk', 1183 '../build/linux/system.gyp:gtk',
1162 ], 1184 ],
1163 }, 1185 },
1164 ], 1186 ],
1165 [ 'os_posix == 1 and OS != "mac"', { 1187 [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
1166 'conditions': [ 1188 'conditions': [
1167 ['linux_use_tcmalloc==1', { 1189 ['linux_use_tcmalloc==1', {
1168 'dependencies': [ 1190 'dependencies': [
1169 '../base/allocator/allocator.gyp:allocator', 1191 '../base/allocator/allocator.gyp:allocator',
1170 ], 1192 ],
1171 }], 1193 }],
1172 ], 1194 ],
1173 }], 1195 }],
1174 [ 'use_kerberos==1', { 1196 [ 'use_kerberos==1', {
1175 'defines': [ 1197 'defines': [
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 }, 1236 },
1215 ], 1237 ],
1216 [ 'OS == "mac"', { 1238 [ 'OS == "mac"', {
1217 'dependencies': [ 1239 'dependencies': [
1218 '../third_party/nss/nss.gyp:nspr', 1240 '../third_party/nss/nss.gyp:nspr',
1219 '../third_party/nss/nss.gyp:nss', 1241 '../third_party/nss/nss.gyp:nss',
1220 'third_party/nss/ssl.gyp:ssl', 1242 'third_party/nss/ssl.gyp:ssl',
1221 ], 1243 ],
1222 }, 1244 },
1223 ], 1245 ],
1246 [ 'OS == "android"', {
1247 'dependencies': [
1248 '../build/android/system.gyp:ssl',
1249 ],
1250 'sources!': [
1251 'dns/dns_config_service_posix_unittest.cc',
1252 'dns/dns_config_service_unittest.cc',
1253 ],
1254 },
1255 ],
1224 ], 1256 ],
1225 }, 1257 },
1226 { 1258 {
1227 'target_name': 'net_perftests', 1259 'target_name': 'net_perftests',
1228 'type': 'executable', 1260 'type': 'executable',
1229 'dependencies': [ 1261 'dependencies': [
1230 'net', 1262 'net',
1231 'net_test_support', 1263 'net_test_support',
1232 '../base/base.gyp:base', 1264 '../base/base.gyp:base',
1233 '../base/base.gyp:base_i18n', 1265 '../base/base.gyp:base_i18n',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 ], 1382 ],
1351 'conditions': [ 1383 'conditions': [
1352 ['inside_chromium_build==1', { 1384 ['inside_chromium_build==1', {
1353 'dependencies': [ 1385 'dependencies': [
1354 '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_co mpile', 1386 '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_co mpile',
1355 # The test server uses Python modules generated by the sync protos. 1387 # The test server uses Python modules generated by the sync protos.
1356 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', 1388 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
1357 '../third_party/protobuf/protobuf.gyp:py_proto', 1389 '../third_party/protobuf/protobuf.gyp:py_proto',
1358 ], 1390 ],
1359 }], 1391 }],
1360 ['os_posix == 1 and OS != "mac"', { 1392 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1361 'conditions': [ 1393 'conditions': [
1362 ['use_openssl==1', { 1394 ['use_openssl==1', {
1363 'dependencies': [ 1395 'dependencies': [
1364 '../third_party/openssl/openssl.gyp:openssl', 1396 '../third_party/openssl/openssl.gyp:openssl',
1365 ], 1397 ],
1366 }, { 1398 }, {
1367 'dependencies': [ 1399 'dependencies': [
1368 '../build/linux/system.gyp:ssl', 1400 '../build/linux/system.gyp:ssl',
1369 ], 1401 ],
1370 }], 1402 }],
1371 ], 1403 ],
1372 }], 1404 }],
1373 ['os_posix == 1 and OS != "mac"', { 1405 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1374 'conditions': [ 1406 'conditions': [
1375 ['linux_use_tcmalloc==1', { 1407 ['linux_use_tcmalloc==1', {
1376 'dependencies': [ 1408 'dependencies': [
1377 '../base/allocator/allocator.gyp:allocator', 1409 '../base/allocator/allocator.gyp:allocator',
1378 ], 1410 ],
1379 }], 1411 }],
1380 ], 1412 ],
1381 }], 1413 }],
1382 ], 1414 ],
1383 }, 1415 },
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
1476 'include_dirs': [ 1508 'include_dirs': [
1477 '..', 1509 '..',
1478 ], 1510 ],
1479 'sources': [ 1511 'sources': [
1480 'base/ssl_false_start_blacklist_process.cc', 1512 'base/ssl_false_start_blacklist_process.cc',
1481 'base/ssl_false_start_blacklist.h', 1513 'base/ssl_false_start_blacklist.h',
1482 ], 1514 ],
1483 }, 1515 },
1484 ], 1516 ],
1485 'conditions': [ 1517 'conditions': [
1486 ['os_posix == 1 and OS != "mac"', { 1518 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1487 'targets': [ 1519 'targets': [
1488 { 1520 {
1489 'target_name': 'flip_in_mem_edsm_server', 1521 'target_name': 'flip_in_mem_edsm_server',
1490 'type': 'executable', 1522 'type': 'executable',
1491 'cflags': [ 1523 'cflags': [
1492 '-Wno-deprecated', 1524 '-Wno-deprecated',
1493 ], 1525 ],
1494 'dependencies': [ 1526 'dependencies': [
1495 '../base/base.gyp:base', 1527 '../base/base.gyp:base',
1496 'net', 1528 'net',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1625 'tools/dump_cache/url_to_filename_encoder.cc', 1657 'tools/dump_cache/url_to_filename_encoder.cc',
1626 'tools/dump_cache/url_to_filename_encoder.h', 1658 'tools/dump_cache/url_to_filename_encoder.h',
1627 'tools/dump_cache/url_utilities.h', 1659 'tools/dump_cache/url_utilities.h',
1628 'tools/dump_cache/url_utilities.cc', 1660 'tools/dump_cache/url_utilities.cc',
1629 ], 1661 ],
1630 }, 1662 },
1631 ], 1663 ],
1632 }], 1664 }],
1633 ], 1665 ],
1634 } 1666 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698