| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") | 
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") | 
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") | 
| 8 import("//build/module_args/v8.gni") | 8 import("//build/module_args/v8.gni") | 
| 9 import("//url/config.gni") | 9 import("//url/config.gni") | 
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") | 
| (...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1348     if (is_android) { | 1348     if (is_android) { | 
| 1349       sources -= [ | 1349       sources -= [ | 
| 1350         # See bug http://crbug.com/344533. | 1350         # See bug http://crbug.com/344533. | 
| 1351         "disk_cache/blockfile/index_table_v3_unittest.cc", | 1351         "disk_cache/blockfile/index_table_v3_unittest.cc", | 
| 1352 | 1352 | 
| 1353         # No res_ninit() et al on Android, so this doesn't make a lot of | 1353         # No res_ninit() et al on Android, so this doesn't make a lot of | 
| 1354         # sense. | 1354         # sense. | 
| 1355         "dns/dns_config_service_posix_unittest.cc", | 1355         "dns/dns_config_service_posix_unittest.cc", | 
| 1356       ] | 1356       ] | 
| 1357       deps += [ ":net_test_jni_headers" ] | 1357       deps += [ ":net_test_jni_headers" ] | 
|  | 1358       isolate_file = "net_unittests.isolate" | 
| 1358     } | 1359     } | 
| 1359 | 1360 | 
| 1360     if (v8_use_external_startup_data) { | 1361     if (v8_use_external_startup_data) { | 
| 1361       deps += [ "//gin" ] | 1362       deps += [ "//gin" ] | 
| 1362     } | 1363     } | 
| 1363 | 1364 | 
| 1364     if (!use_nss_certs) { | 1365     if (!use_nss_certs) { | 
| 1365       sources -= [ | 1366       sources -= [ | 
| 1366         "cert/nss_cert_database_unittest.cc", | 1367         "cert/nss_cert_database_unittest.cc", | 
| 1367         "ssl/client_cert_store_nss_unittest.cc", | 1368         "ssl/client_cert_store_nss_unittest.cc", | 
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1618   } else { | 1619   } else { | 
| 1619     sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 1620     sources -= [ "proxy/proxy_resolver_perftest.cc" ] | 
| 1620   } | 1621   } | 
| 1621 | 1622 | 
| 1622   if (is_win && icu_use_data_file) { | 1623   if (is_win && icu_use_data_file) { | 
| 1623     # This is needed to trigger the dll copy step on windows. | 1624     # This is needed to trigger the dll copy step on windows. | 
| 1624     # TODO(mark): Specifying this here shouldn't be necessary. | 1625     # TODO(mark): Specifying this here shouldn't be necessary. | 
| 1625     deps += [ "//third_party/icu:icudata" ] | 1626     deps += [ "//third_party/icu:icudata" ] | 
| 1626   } | 1627   } | 
| 1627 } | 1628 } | 
| OLD | NEW | 
|---|