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

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: split out unreviewed files 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
« no previous file with comments | « net/dns/dns_config_service_posix.cc ('k') | net/socket/ssl_client_socket_openssl.cc » ('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 (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 ],
(...skipping 10 matching lines...) Expand all
33 '../crypto/crypto.gyp:crypto', 33 '../crypto/crypto.gyp:crypto',
34 '../sdch/sdch.gyp:sdch', 34 '../sdch/sdch.gyp:sdch',
35 '../third_party/icu/icu.gyp:icui18n', 35 '../third_party/icu/icu.gyp:icui18n',
36 '../third_party/icu/icu.gyp:icuuc', 36 '../third_party/icu/icu.gyp:icuuc',
37 '../third_party/zlib/zlib.gyp:zlib', 37 '../third_party/zlib/zlib.gyp:zlib',
38 '../v8/tools/gyp/v8.gyp:v8', 38 '../v8/tools/gyp/v8.gyp:v8',
39 'net_resources', 39 'net_resources',
40 'ssl_false_start_blacklist_process#host', 40 'ssl_false_start_blacklist_process#host',
41 ], 41 ],
42 'sources': [ 42 'sources': [
43 'android/network_library.cc',
44 'android/network_library.h',
43 'base/address_family.h', 45 'base/address_family.h',
44 'base/address_list.cc', 46 'base/address_list.cc',
45 'base/address_list.h', 47 'base/address_list.h',
46 'base/address_list_net_log_param.cc', 48 'base/address_list_net_log_param.cc',
47 'base/address_list_net_log_param.h', 49 'base/address_list_net_log_param.h',
48 'base/asn1_util.cc', 50 'base/asn1_util.cc',
49 'base/asn1_util.h', 51 'base/asn1_util.h',
50 'base/auth.cc', 52 'base/auth.cc',
51 'base/auth.h', 53 'base/auth.h',
52 'base/backoff_entry.cc', 54 'base/backoff_entry.cc',
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 'base/network_change_notifier_win.cc', 180 'base/network_change_notifier_win.cc',
179 'base/network_change_notifier_win.h', 181 'base/network_change_notifier_win.h',
180 'base/network_config_watcher_mac.cc', 182 'base/network_config_watcher_mac.cc',
181 'base/network_config_watcher_mac.h', 183 'base/network_config_watcher_mac.h',
182 'base/network_delegate.cc', 184 'base/network_delegate.cc',
183 'base/network_delegate.h', 185 'base/network_delegate.h',
184 'base/nss_memio.c', 186 'base/nss_memio.c',
185 'base/nss_memio.h', 187 'base/nss_memio.h',
186 'base/openssl_memory_private_key_store.cc', 188 'base/openssl_memory_private_key_store.cc',
187 'base/openssl_private_key_store.h', 189 'base/openssl_private_key_store.h',
190 'base/openssl_private_key_store_android.cc',
188 'base/origin_bound_cert_service.cc', 191 'base/origin_bound_cert_service.cc',
189 'base/origin_bound_cert_service.h', 192 'base/origin_bound_cert_service.h',
190 'base/origin_bound_cert_store.h', 193 'base/origin_bound_cert_store.h',
191 'base/pem_tokenizer.cc', 194 'base/pem_tokenizer.cc',
192 'base/pem_tokenizer.h', 195 'base/pem_tokenizer.h',
193 'base/platform_mime_util.h', 196 'base/platform_mime_util.h',
194 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 197 # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
195 'base/platform_mime_util_linux.cc', 198 'base/platform_mime_util_linux.cc',
196 'base/platform_mime_util_mac.cc', 199 'base/platform_mime_util_mac.cc',
197 'base/platform_mime_util_win.cc', 200 'base/platform_mime_util_win.cc',
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 '$(SDKROOT)/usr/lib/libresolv.dylib', 931 '$(SDKROOT)/usr/lib/libresolv.dylib',
929 ] 932 ]
930 }, 933 },
931 }, 934 },
932 ], 935 ],
933 [ 'OS == "android"', { 936 [ 'OS == "android"', {
934 'defines': [ 937 'defines': [
935 # Android can shut down our app at any time, so we persist session cookies. 938 # Android can shut down our app at any time, so we persist session cookies.
936 'ENABLE_PERSISTENT_SESSION_COOKIES' 939 'ENABLE_PERSISTENT_SESSION_COOKIES'
937 ], 940 ],
941 'dependencies': [
942 '../build/android/system.gyp:ssl',
943 ],
944 'sources/': [
945 # TODO(jingzhao): The below files are excluded because of the
946 # missing JNI, add them back when JNI is ready.
947 ['exclude', '^android/'],
948 ],
938 }, { # else OS! = "android" 949 }, { # else OS! = "android"
939 'defines': [ 950 'defines': [
940 # These are the features Android doesn't support. 951 # These are the features Android doesn't support.
941 'ENABLE_MEDIA_CODEC_THEORA', 952 'ENABLE_MEDIA_CODEC_THEORA',
942 'ENABLE_MEDIA_TYPE_OGG', 953 'ENABLE_MEDIA_TYPE_OGG',
943 ], 954 ],
944 }, 955 },
945 ], 956 ],
946 [ 'OS == "linux"', { 957 [ 'OS == "linux"', {
947 'dependencies': [ 958 'dependencies': [
948 '../build/linux/system.gyp:dbus', 959 '../build/linux/system.gyp:dbus',
949 '../dbus/dbus.gyp:dbus', 960 '../dbus/dbus.gyp:dbus',
950 ], 961 ],
951 }, 962 },
952 ], 963 ],
953 ], 964 ],
965 'target_conditions': [
966 ['OS == "android"', {
967 'sources/': [
968 ['include', '^base/platform_mime_util_linux\\.cc$'],
969 ],
970 }],
971 ],
954 }, 972 },
955 { 973 {
956 'target_name': 'net_unittests', 974 'target_name': 'net_unittests',
957 'type': 'executable', 975 'type': 'executable',
958 'dependencies': [ 976 'dependencies': [
959 'net', 977 'net',
960 'net_test_support', 978 'net_test_support',
961 '../base/base.gyp:base', 979 '../base/base.gyp:base',
962 '../base/base.gyp:base_i18n', 980 '../base/base.gyp:base_i18n',
963 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 981 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1172 'base/cert_database_nss_unittest.cc', 1190 'base/cert_database_nss_unittest.cc',
1173 ], 1191 ],
1174 }, 1192 },
1175 ], 1193 ],
1176 [ 'toolkit_uses_gtk == 1', { 1194 [ 'toolkit_uses_gtk == 1', {
1177 'dependencies': [ 1195 'dependencies': [
1178 '../build/linux/system.gyp:gtk', 1196 '../build/linux/system.gyp:gtk',
1179 ], 1197 ],
1180 }, 1198 },
1181 ], 1199 ],
1182 [ 'os_posix == 1 and OS != "mac"', { 1200 [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
1183 'conditions': [ 1201 'conditions': [
1184 ['linux_use_tcmalloc==1', { 1202 ['linux_use_tcmalloc==1', {
1185 'dependencies': [ 1203 'dependencies': [
1186 '../base/allocator/allocator.gyp:allocator', 1204 '../base/allocator/allocator.gyp:allocator',
1187 ], 1205 ],
1188 }], 1206 }],
1189 ], 1207 ],
1190 }], 1208 }],
1191 [ 'use_kerberos==1', { 1209 [ 'use_kerberos==1', {
1192 'defines': [ 1210 'defines': [
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 ], 1256 ],
1239 }, 1257 },
1240 ], 1258 ],
1241 [ 'OS == "linux"', { 1259 [ 'OS == "linux"', {
1242 'dependencies': [ 1260 'dependencies': [
1243 '../build/linux/system.gyp:dbus', 1261 '../build/linux/system.gyp:dbus',
1244 '../dbus/dbus.gyp:dbus_test_support', 1262 '../dbus/dbus.gyp:dbus_test_support',
1245 ], 1263 ],
1246 }, 1264 },
1247 ], 1265 ],
1266 [ 'OS == "android"', {
1267 'dependencies': [
1268 '../build/android/system.gyp:ssl',
1269 ],
1270 'sources!': [
1271 'dns/dns_config_service_posix_unittest.cc',
1272 ],
1273 },
1274 ],
1248 ], 1275 ],
1249 }, 1276 },
1250 { 1277 {
1251 'target_name': 'net_perftests', 1278 'target_name': 'net_perftests',
1252 'type': 'executable', 1279 'type': 'executable',
1253 'dependencies': [ 1280 'dependencies': [
1254 'net', 1281 'net',
1255 'net_test_support', 1282 'net_test_support',
1256 '../base/base.gyp:base', 1283 '../base/base.gyp:base',
1257 '../base/base.gyp:base_i18n', 1284 '../base/base.gyp:base_i18n',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 ], 1401 ],
1375 'conditions': [ 1402 'conditions': [
1376 ['inside_chromium_build==1', { 1403 ['inside_chromium_build==1', {
1377 'dependencies': [ 1404 'dependencies': [
1378 '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_co mpile', 1405 '../chrome/app/policy/cloud_policy_codegen.gyp:cloud_policy_proto_co mpile',
1379 # The test server uses Python modules generated by the sync protos. 1406 # The test server uses Python modules generated by the sync protos.
1380 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', 1407 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
1381 '../third_party/protobuf/protobuf.gyp:py_proto', 1408 '../third_party/protobuf/protobuf.gyp:py_proto',
1382 ], 1409 ],
1383 }], 1410 }],
1384 ['os_posix == 1 and OS != "mac"', { 1411 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1385 'conditions': [ 1412 'conditions': [
1386 ['use_openssl==1', { 1413 ['use_openssl==1', {
1387 'dependencies': [ 1414 'dependencies': [
1388 '../third_party/openssl/openssl.gyp:openssl', 1415 '../third_party/openssl/openssl.gyp:openssl',
1389 ], 1416 ],
1390 }, { 1417 }, {
1391 'dependencies': [ 1418 'dependencies': [
1392 '../build/linux/system.gyp:ssl', 1419 '../build/linux/system.gyp:ssl',
1393 ], 1420 ],
1394 }], 1421 }],
1395 ], 1422 ],
1396 }], 1423 }],
1397 ['os_posix == 1 and OS != "mac"', { 1424 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1398 'conditions': [ 1425 'conditions': [
1399 ['linux_use_tcmalloc==1', { 1426 ['linux_use_tcmalloc==1', {
1400 'dependencies': [ 1427 'dependencies': [
1401 '../base/allocator/allocator.gyp:allocator', 1428 '../base/allocator/allocator.gyp:allocator',
1402 ], 1429 ],
1403 }], 1430 }],
1404 ], 1431 ],
1405 }], 1432 }],
1406 ], 1433 ],
1407 }, 1434 },
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
1503 'include_dirs': [ 1530 'include_dirs': [
1504 '..', 1531 '..',
1505 ], 1532 ],
1506 'sources': [ 1533 'sources': [
1507 'base/ssl_false_start_blacklist_process.cc', 1534 'base/ssl_false_start_blacklist_process.cc',
1508 'base/ssl_false_start_blacklist.h', 1535 'base/ssl_false_start_blacklist.h',
1509 ], 1536 ],
1510 }, 1537 },
1511 ], 1538 ],
1512 'conditions': [ 1539 'conditions': [
1513 ['os_posix == 1 and OS != "mac"', { 1540 ['os_posix == 1 and OS != "mac" and OS != "android"', {
1514 'targets': [ 1541 'targets': [
1515 { 1542 {
1516 'target_name': 'flip_in_mem_edsm_server', 1543 'target_name': 'flip_in_mem_edsm_server',
1517 'type': 'executable', 1544 'type': 'executable',
1518 'cflags': [ 1545 'cflags': [
1519 '-Wno-deprecated', 1546 '-Wno-deprecated',
1520 ], 1547 ],
1521 'dependencies': [ 1548 'dependencies': [
1522 '../base/base.gyp:base', 1549 '../base/base.gyp:base',
1523 'net', 1550 'net',
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 'tools/dump_cache/url_to_filename_encoder.cc', 1680 'tools/dump_cache/url_to_filename_encoder.cc',
1654 'tools/dump_cache/url_to_filename_encoder.h', 1681 'tools/dump_cache/url_to_filename_encoder.h',
1655 'tools/dump_cache/url_utilities.h', 1682 'tools/dump_cache/url_utilities.h',
1656 'tools/dump_cache/url_utilities.cc', 1683 'tools/dump_cache/url_utilities.cc',
1657 ], 1684 ],
1658 }, 1685 },
1659 ], 1686 ],
1660 }], 1687 }],
1661 ], 1688 ],
1662 } 1689 }
OLDNEW
« no previous file with comments | « net/dns/dns_config_service_posix.cc ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698