| OLD | NEW |
| 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': [ |
| (...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 932 'ENABLE_PERSISTENT_SESSION_COOKIES' | 932 'ENABLE_PERSISTENT_SESSION_COOKIES' |
| 933 ], | 933 ], |
| 934 }, { # else OS! = "android" | 934 }, { # else OS! = "android" |
| 935 'defines': [ | 935 'defines': [ |
| 936 # These are the features Android doesn't support. | 936 # These are the features Android doesn't support. |
| 937 'ENABLE_MEDIA_CODEC_THEORA', | 937 'ENABLE_MEDIA_CODEC_THEORA', |
| 938 'ENABLE_MEDIA_TYPE_OGG', | 938 'ENABLE_MEDIA_TYPE_OGG', |
| 939 ], | 939 ], |
| 940 }, | 940 }, |
| 941 ], | 941 ], |
| 942 [ 'OS == "linux"', { | |
| 943 'dependencies': [ | |
| 944 '../build/linux/system.gyp:dbus', | |
| 945 '../dbus/dbus.gyp:dbus', | |
| 946 ], | |
| 947 }, | |
| 948 ], | |
| 949 ], | 942 ], |
| 950 }, | 943 }, |
| 951 { | 944 { |
| 952 'target_name': 'net_unittests', | 945 'target_name': 'net_unittests', |
| 953 'type': 'executable', | 946 'type': 'executable', |
| 954 'dependencies': [ | 947 'dependencies': [ |
| 955 'net', | 948 'net', |
| 956 'net_test_support', | 949 'net_test_support', |
| 957 '../base/base.gyp:base', | 950 '../base/base.gyp:base', |
| 958 '../base/base.gyp:base_i18n', | 951 '../base/base.gyp:base_i18n', |
| (...skipping 30 matching lines...) Expand all Loading... |
| 989 'base/listen_socket_unittest.cc', | 982 'base/listen_socket_unittest.cc', |
| 990 'base/listen_socket_unittest.h', | 983 'base/listen_socket_unittest.h', |
| 991 'base/mapped_host_resolver_unittest.cc', | 984 'base/mapped_host_resolver_unittest.cc', |
| 992 'base/mime_sniffer_unittest.cc', | 985 'base/mime_sniffer_unittest.cc', |
| 993 'base/mime_util_unittest.cc', | 986 'base/mime_util_unittest.cc', |
| 994 'base/mock_filter_context.cc', | 987 'base/mock_filter_context.cc', |
| 995 'base/mock_filter_context.h', | 988 'base/mock_filter_context.h', |
| 996 'base/net_log_unittest.cc', | 989 'base/net_log_unittest.cc', |
| 997 'base/net_log_unittest.h', | 990 'base/net_log_unittest.h', |
| 998 'base/net_util_unittest.cc', | 991 'base/net_util_unittest.cc', |
| 999 'base/network_change_notifier_linux_unittest.cc', | |
| 1000 'base/network_change_notifier_win_unittest.cc', | 992 'base/network_change_notifier_win_unittest.cc', |
| 1001 'base/origin_bound_cert_service_unittest.cc', | 993 'base/origin_bound_cert_service_unittest.cc', |
| 1002 'base/pem_tokenizer_unittest.cc', | 994 'base/pem_tokenizer_unittest.cc', |
| 1003 'base/registry_controlled_domain_unittest.cc', | 995 'base/registry_controlled_domain_unittest.cc', |
| 1004 'base/run_all_unittests.cc', | 996 'base/run_all_unittests.cc', |
| 1005 'base/sdch_filter_unittest.cc', | 997 'base/sdch_filter_unittest.cc', |
| 1006 'base/single_request_host_resolver_unittest.cc', | 998 'base/single_request_host_resolver_unittest.cc', |
| 1007 'base/ssl_cipher_suite_names_unittest.cc', | 999 'base/ssl_cipher_suite_names_unittest.cc', |
| 1008 'base/ssl_client_auth_cache_unittest.cc', | 1000 'base/ssl_client_auth_cache_unittest.cc', |
| 1009 'base/ssl_config_service_unittest.cc', | 1001 'base/ssl_config_service_unittest.cc', |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1225 }, | 1217 }, |
| 1226 ], | 1218 ], |
| 1227 [ 'OS == "mac"', { | 1219 [ 'OS == "mac"', { |
| 1228 'dependencies': [ | 1220 'dependencies': [ |
| 1229 '../third_party/nss/nss.gyp:nspr', | 1221 '../third_party/nss/nss.gyp:nspr', |
| 1230 '../third_party/nss/nss.gyp:nss', | 1222 '../third_party/nss/nss.gyp:nss', |
| 1231 'third_party/nss/ssl.gyp:ssl', | 1223 'third_party/nss/ssl.gyp:ssl', |
| 1232 ], | 1224 ], |
| 1233 }, | 1225 }, |
| 1234 ], | 1226 ], |
| 1235 [ 'OS == "linux"', { | |
| 1236 'dependencies': [ | |
| 1237 '../build/linux/system.gyp:dbus', | |
| 1238 '../dbus/dbus.gyp:dbus_test_support', | |
| 1239 ], | |
| 1240 }, | |
| 1241 ], | |
| 1242 ], | 1227 ], |
| 1243 }, | 1228 }, |
| 1244 { | 1229 { |
| 1245 'target_name': 'net_perftests', | 1230 'target_name': 'net_perftests', |
| 1246 'type': 'executable', | 1231 'type': 'executable', |
| 1247 'dependencies': [ | 1232 'dependencies': [ |
| 1248 'net', | 1233 'net', |
| 1249 'net_test_support', | 1234 'net_test_support', |
| 1250 '../base/base.gyp:base', | 1235 '../base/base.gyp:base', |
| 1251 '../base/base.gyp:base_i18n', | 1236 '../base/base.gyp:base_i18n', |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1647 'tools/dump_cache/url_to_filename_encoder.cc', | 1632 'tools/dump_cache/url_to_filename_encoder.cc', |
| 1648 'tools/dump_cache/url_to_filename_encoder.h', | 1633 'tools/dump_cache/url_to_filename_encoder.h', |
| 1649 'tools/dump_cache/url_utilities.h', | 1634 'tools/dump_cache/url_utilities.h', |
| 1650 'tools/dump_cache/url_utilities.cc', | 1635 'tools/dump_cache/url_utilities.cc', |
| 1651 ], | 1636 ], |
| 1652 }, | 1637 }, |
| 1653 ], | 1638 ], |
| 1654 }], | 1639 }], |
| 1655 ], | 1640 ], |
| 1656 } | 1641 } |
| OLD | NEW |