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

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: fix a bug in ssl_client_socket_openssl.cc and 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 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 '$(SDKROOT)/usr/lib/libresolv.dylib', 925 '$(SDKROOT)/usr/lib/libresolv.dylib',
923 ] 926 ]
924 }, 927 },
925 }, 928 },
926 ], 929 ],
927 [ 'OS == "android"', { 930 [ 'OS == "android"', {
928 'defines': [ 931 'defines': [
929 # Android can shut down our app at any time, so we persist session cookies. 932 # Android can shut down our app at any time, so we persist session cookies.
930 'ENABLE_PERSISTENT_SESSION_COOKIES' 933 'ENABLE_PERSISTENT_SESSION_COOKIES'
931 ], 934 ],
935 'dependencies': [
936 '../build/android/system.gyp:ssl',
937 ],
938 'sources/': [
939 # TODO(jingzhao): The below files are excluded because of the
940 # missing JNI, add them back when JNI is ready.
941 ['exclude', '^android/'],
942 ],
932 }, { # else OS! = "android" 943 }, { # else OS! = "android"
933 'defines': [ 944 'defines': [
934 # These are the features Android doesn't support. 945 # These are the features Android doesn't support.
935 'ENABLE_MEDIA_CODEC_THEORA', 946 'ENABLE_MEDIA_CODEC_THEORA',
936 'ENABLE_MEDIA_TYPE_OGG', 947 'ENABLE_MEDIA_TYPE_OGG',
937 ], 948 ],
938 }, 949 },
939 ], 950 ],
940 ], 951 ],
952 'target_conditions': [
953 ['OS == "android"', {
954 'sources/': [
955 ['include', '^base/platform_mime_util_linux\\.cc$'],
956 ],
957 }],
958 ],
941 }, 959 },
942 { 960 {
943 'target_name': 'net_unittests', 961 'target_name': 'net_unittests',
944 'type': 'executable', 962 'type': 'executable',
945 'dependencies': [ 963 'dependencies': [
946 'net', 964 'net',
947 'net_test_support', 965 'net_test_support',
948 '../base/base.gyp:base', 966 '../base/base.gyp:base',
949 '../base/base.gyp:base_i18n', 967 '../base/base.gyp:base_i18n',
950 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 968 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 'base/cert_database_nss_unittest.cc', 1175 'base/cert_database_nss_unittest.cc',
1158 ], 1176 ],
1159 }, 1177 },
1160 ], 1178 ],
1161 [ 'toolkit_uses_gtk == 1', { 1179 [ 'toolkit_uses_gtk == 1', {
1162 'dependencies': [ 1180 'dependencies': [
1163 '../build/linux/system.gyp:gtk', 1181 '../build/linux/system.gyp:gtk',
1164 ], 1182 ],
1165 }, 1183 },
1166 ], 1184 ],
1167 [ 'os_posix == 1 and OS != "mac"', { 1185 [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
1168 'conditions': [ 1186 'conditions': [
1169 ['linux_use_tcmalloc==1', { 1187 ['linux_use_tcmalloc==1', {
1170 'dependencies': [ 1188 'dependencies': [
1171 '../base/allocator/allocator.gyp:allocator', 1189 '../base/allocator/allocator.gyp:allocator',
1172 ], 1190 ],
1173 }], 1191 }],
1174 ], 1192 ],
1175 }], 1193 }],
1176 [ 'use_kerberos==1', { 1194 [ 'use_kerberos==1', {
1177 'defines': [ 1195 'defines': [
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 }, 1234 },
1217 ], 1235 ],
1218 [ 'OS == "mac"', { 1236 [ 'OS == "mac"', {
1219 'dependencies': [ 1237 'dependencies': [
1220 '../third_party/nss/nss.gyp:nspr', 1238 '../third_party/nss/nss.gyp:nspr',
1221 '../third_party/nss/nss.gyp:nss', 1239 '../third_party/nss/nss.gyp:nss',
1222 'third_party/nss/ssl.gyp:ssl', 1240 'third_party/nss/ssl.gyp:ssl',
1223 ], 1241 ],
1224 }, 1242 },
1225 ], 1243 ],
1244 [ 'OS == "android"', {
1245 'dependencies': [
1246 '../build/android/system.gyp:ssl',
1247 ],
1248 'sources!': [
1249 'dns/dns_config_service_posix_unittest.cc',
1250 ],
1251 },
1252 ],
1226 ], 1253 ],
1227 }, 1254 },
1228 { 1255 {
1229 'target_name': 'net_perftests', 1256 'target_name': 'net_perftests',
1230 'type': 'executable', 1257 'type': 'executable',
1231 'dependencies': [ 1258 'dependencies': [
1232 'net', 1259 'net',
1233 'net_test_support', 1260 'net_test_support',
1234 '../base/base.gyp:base', 1261 '../base/base.gyp:base',
1235 '../base/base.gyp:base_i18n', 1262 '../base/base.gyp:base_i18n',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 ], 1379 ],
1353 'conditions': [ 1380 'conditions': [
1354 ['inside_chromium_build==1', { 1381 ['inside_chromium_build==1', {
1355 'dependencies': [ 1382 'dependencies': [
1356 '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_co mpile', 1383 '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_co mpile',
1357 # The test server uses Python modules generated by the sync protos. 1384 # The test server uses Python modules generated by the sync protos.
1358 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', 1385 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
1359 '../third_party/protobuf/protobuf.gyp:py_proto', 1386 '../third_party/protobuf/protobuf.gyp:py_proto',
1360 ], 1387 ],
1361 }], 1388 }],
1362 ['os_posix == 1 and OS != "mac"', { 1389 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1363 'conditions': [ 1390 'conditions': [
1364 ['use_openssl==1', { 1391 ['use_openssl==1', {
1365 'dependencies': [ 1392 'dependencies': [
1366 '../third_party/openssl/openssl.gyp:openssl', 1393 '../third_party/openssl/openssl.gyp:openssl',
1367 ], 1394 ],
1368 }, { 1395 }, {
1369 'dependencies': [ 1396 'dependencies': [
1370 '../build/linux/system.gyp:ssl', 1397 '../build/linux/system.gyp:ssl',
1371 ], 1398 ],
1372 }], 1399 }],
1373 ], 1400 ],
1374 }], 1401 }],
1375 ['os_posix == 1 and OS != "mac"', { 1402 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1376 'conditions': [ 1403 'conditions': [
1377 ['linux_use_tcmalloc==1', { 1404 ['linux_use_tcmalloc==1', {
1378 'dependencies': [ 1405 'dependencies': [
1379 '../base/allocator/allocator.gyp:allocator', 1406 '../base/allocator/allocator.gyp:allocator',
1380 ], 1407 ],
1381 }], 1408 }],
1382 ], 1409 ],
1383 }], 1410 }],
1384 ], 1411 ],
1385 }, 1412 },
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
1478 'include_dirs': [ 1505 'include_dirs': [
1479 '..', 1506 '..',
1480 ], 1507 ],
1481 'sources': [ 1508 'sources': [
1482 'base/ssl_false_start_blacklist_process.cc', 1509 'base/ssl_false_start_blacklist_process.cc',
1483 'base/ssl_false_start_blacklist.h', 1510 'base/ssl_false_start_blacklist.h',
1484 ], 1511 ],
1485 }, 1512 },
1486 ], 1513 ],
1487 'conditions': [ 1514 'conditions': [
1488 ['os_posix == 1 and OS != "mac"', { 1515 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1489 'targets': [ 1516 'targets': [
1490 { 1517 {
1491 'target_name': 'flip_in_mem_edsm_server', 1518 'target_name': 'flip_in_mem_edsm_server',
1492 'type': 'executable', 1519 'type': 'executable',
1493 'cflags': [ 1520 'cflags': [
1494 '-Wno-deprecated', 1521 '-Wno-deprecated',
1495 ], 1522 ],
1496 'dependencies': [ 1523 'dependencies': [
1497 '../base/base.gyp:base', 1524 '../base/base.gyp:base',
1498 'net', 1525 'net',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 'tools/dump_cache/url_to_filename_encoder.cc', 1654 'tools/dump_cache/url_to_filename_encoder.cc',
1628 'tools/dump_cache/url_to_filename_encoder.h', 1655 'tools/dump_cache/url_to_filename_encoder.h',
1629 'tools/dump_cache/url_utilities.h', 1656 'tools/dump_cache/url_utilities.h',
1630 'tools/dump_cache/url_utilities.cc', 1657 'tools/dump_cache/url_utilities.cc',
1631 ], 1658 ],
1632 }, 1659 },
1633 ], 1660 ],
1634 }], 1661 }],
1635 ], 1662 ],
1636 } 1663 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698