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

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

Powered by Google App Engine
This is Rietveld 408576698