| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 # Defines an extra set of libs with an alternate copy of org.apache.http. | 8 # Defines an extra set of libs with an alternate copy of org.apache.http. |
| 9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed. | 9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed. |
| 10 'net_test_extra_libs': [], | 10 'net_test_extra_libs': [], |
| 11 'linux_link_kerberos%': 0, | 11 'linux_link_kerberos%': 0, |
| 12 'conditions': [ | 12 'conditions': [ |
| 13 ['chromeos==1 or embedded==1 or OS=="android" or OS=="ios"', { | 13 ['chromeos==1 or embedded==1 or OS=="ios"', { |
| 14 # Disable Kerberos on ChromeOS, Android and iOS, at least for now. | 14 # Disable Kerberos on ChromeOS and iOS, at least for now. |
| 15 # It needs configuration (krb5.conf and so on). | 15 # It needs configuration (krb5.conf and so on). |
| 16 'use_kerberos%': 0, | 16 'use_kerberos%': 0, |
| 17 }, { # chromeos == 0 and embedded==0 and OS!="android" and OS!="ios" | 17 }, { # chromeos == 0 and embedded==0 and OS!="ios" |
| 18 'use_kerberos%': 1, | 18 'use_kerberos%': 1, |
| 19 }], | 19 }], |
| 20 ['OS=="android" and target_arch != "ia32"', { | 20 ['OS=="android" and target_arch != "ia32"', { |
| 21 # The way the cache uses mmap() is inefficient on some Android devices. | 21 # The way the cache uses mmap() is inefficient on some Android devices. |
| 22 # If this flag is set, we hackily avoid using mmap() in the disk cache. | 22 # If this flag is set, we hackily avoid using mmap() in the disk cache. |
| 23 # We are pretty confident that mmap-ing the index would not hurt any | 23 # We are pretty confident that mmap-ing the index would not hurt any |
| 24 # existing x86 android devices, but we cannot be so sure about the | 24 # existing x86 android devices, but we cannot be so sure about the |
| 25 # variety of ARM devices. So enable it for x86 only for now. | 25 # variety of ARM devices. So enable it for x86 only for now. |
| 26 'posix_avoid_mmap%': 1, | 26 'posix_avoid_mmap%': 1, |
| 27 }, { | 27 }, { |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 'dependencies': [ | 216 'dependencies': [ |
| 217 '../base/allocator/allocator.gyp:allocator', | 217 '../base/allocator/allocator.gyp:allocator', |
| 218 ], | 218 ], |
| 219 }], | 219 }], |
| 220 ], | 220 ], |
| 221 }], | 221 }], |
| 222 [ 'use_kerberos==1', { | 222 [ 'use_kerberos==1', { |
| 223 'defines': [ | 223 'defines': [ |
| 224 'USE_KERBEROS', | 224 'USE_KERBEROS', |
| 225 ], | 225 ], |
| 226 }, { # use_kerberos == 0 | 226 }], |
| 227 [ 'use_kerberos==0 or OS == "android"', { |
| 228 # These are excluded on Android, because the actual Kerberos support, |
| 229 # which these test, is in a separate app on Android. |
| 227 'sources!': [ | 230 'sources!': [ |
| 228 'http/http_auth_gssapi_posix_unittest.cc', | 231 'http/http_auth_gssapi_posix_unittest.cc', |
| 229 'http/http_auth_handler_negotiate_unittest.cc', | |
| 230 'http/mock_gssapi_library_posix.cc', | 232 'http/mock_gssapi_library_posix.cc', |
| 231 'http/mock_gssapi_library_posix.h', | 233 'http/mock_gssapi_library_posix.h', |
| 232 ], | 234 ], |
| 233 }], | 235 }], |
| 236 [ 'use_kerberos==0', { |
| 237 'sources!': [ |
| 238 'http/http_auth_handler_negotiate_unittest.cc', |
| 239 ], |
| 240 }], |
| 234 [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != "
ios")', { | 241 [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != "
ios")', { |
| 235 # Only include this test when on Posix and using NSS for | 242 # Only include this test when on Posix and using NSS for |
| 236 # cert verification or on iOS (which also uses NSS for certs). | 243 # cert verification or on iOS (which also uses NSS for certs). |
| 237 'sources!': [ | 244 'sources!': [ |
| 238 'cert_net/nss_ocsp_unittest.cc', | 245 'cert_net/nss_ocsp_unittest.cc', |
| 239 ], | 246 ], |
| 240 }], | 247 }], |
| 241 [ 'use_openssl==1', { | 248 [ 'use_openssl==1', { |
| 242 # When building for OpenSSL, we need to exclude NSS specific tests | 249 # When building for OpenSSL, we need to exclude NSS specific tests |
| 243 # or functionality not supported by OpenSSL yet. | 250 # or functionality not supported by OpenSSL yet. |
| (...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 }, | 1353 }, |
| 1347 { | 1354 { |
| 1348 'target_name': 'net_jni_headers', | 1355 'target_name': 'net_jni_headers', |
| 1349 'type': 'none', | 1356 'type': 'none', |
| 1350 'sources': [ | 1357 'sources': [ |
| 1351 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', | 1358 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', |
| 1352 'android/java/src/org/chromium/net/AndroidKeyStore.java', | 1359 'android/java/src/org/chromium/net/AndroidKeyStore.java', |
| 1353 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', | 1360 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', |
| 1354 'android/java/src/org/chromium/net/AndroidPrivateKey.java', | 1361 'android/java/src/org/chromium/net/AndroidPrivateKey.java', |
| 1355 'android/java/src/org/chromium/net/GURLUtils.java', | 1362 'android/java/src/org/chromium/net/GURLUtils.java', |
| 1363 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java', |
| 1356 'android/java/src/org/chromium/net/NetStringUtil.java', | 1364 'android/java/src/org/chromium/net/NetStringUtil.java', |
| 1357 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', | 1365 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', |
| 1358 'android/java/src/org/chromium/net/ProxyChangeListener.java', | 1366 'android/java/src/org/chromium/net/ProxyChangeListener.java', |
| 1359 'android/java/src/org/chromium/net/X509Util.java', | 1367 'android/java/src/org/chromium/net/X509Util.java', |
| 1360 ], | 1368 ], |
| 1361 'variables': { | 1369 'variables': { |
| 1362 'jni_gen_package': 'net', | 1370 'jni_gen_package': 'net', |
| 1363 }, | 1371 }, |
| 1364 'includes': [ '../build/jni_generator.gypi' ], | 1372 'includes': [ '../build/jni_generator.gypi' ], |
| 1365 }, | 1373 }, |
| 1366 { | 1374 { |
| 1367 'target_name': 'net_test_jni_headers', | 1375 'target_name': 'net_test_jni_headers', |
| 1368 'type': 'none', | 1376 'type': 'none', |
| 1369 'sources': [ | 1377 'sources': [ |
| 1370 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
', | 1378 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
', |
| 1379 'test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthent
icator.java', |
| 1371 ], | 1380 ], |
| 1372 'variables': { | 1381 'variables': { |
| 1373 'jni_gen_package': 'net', | 1382 'jni_gen_package': 'net', |
| 1374 }, | 1383 }, |
| 1375 'includes': [ '../build/jni_generator.gypi' ], | 1384 'includes': [ '../build/jni_generator.gypi' ], |
| 1376 }, | 1385 }, |
| 1377 { | 1386 { |
| 1378 'target_name': 'net_java', | 1387 'target_name': 'net_java', |
| 1379 'type': 'none', | 1388 'type': 'none', |
| 1380 'variables': { | 1389 'variables': { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 1407 }, | 1416 }, |
| 1408 { | 1417 { |
| 1409 'target_name': 'net_java_test_support', | 1418 'target_name': 'net_java_test_support', |
| 1410 'type': 'none', | 1419 'type': 'none', |
| 1411 'variables': { | 1420 'variables': { |
| 1412 'java_in_dir': '../net/test/android/javatests', | 1421 'java_in_dir': '../net/test/android/javatests', |
| 1413 }, | 1422 }, |
| 1414 'dependencies': [ | 1423 'dependencies': [ |
| 1415 'url_request_failed_job_java', | 1424 'url_request_failed_job_java', |
| 1416 '../base/base.gyp:base_java', | 1425 '../base/base.gyp:base_java', |
| 1426 'net_java', |
| 1417 '<@(net_test_extra_libs)', | 1427 '<@(net_test_extra_libs)', |
| 1418 ], | 1428 ], |
| 1419 'includes': [ '../build/java.gypi' ], | 1429 'includes': [ '../build/java.gypi' ], |
| 1420 }, | 1430 }, |
| 1421 { | 1431 { |
| 1422 'target_name': 'url_request_failed_job_java', | 1432 'target_name': 'url_request_failed_job_java', |
| 1423 'type': 'none', | 1433 'type': 'none', |
| 1424 'variables': { | 1434 'variables': { |
| 1425 'source_file': 'test/url_request/url_request_failed_job.h', | 1435 'source_file': 'test/url_request/url_request_failed_job.h', |
| 1426 }, | 1436 }, |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1482 'source_file': 'android/keystore.h', | 1492 'source_file': 'android/keystore.h', |
| 1483 }, | 1493 }, |
| 1484 'includes': [ '../build/android/java_cpp_enum.gypi' ], | 1494 'includes': [ '../build/android/java_cpp_enum.gypi' ], |
| 1485 }, | 1495 }, |
| 1486 { | 1496 { |
| 1487 'target_name': 'net_unittests_apk', | 1497 'target_name': 'net_unittests_apk', |
| 1488 'type': 'none', | 1498 'type': 'none', |
| 1489 'dependencies': [ | 1499 'dependencies': [ |
| 1490 'net_java', | 1500 'net_java', |
| 1491 'net_javatests', | 1501 'net_javatests', |
| 1502 'net_java_test_support', |
| 1492 'net_unittests', | 1503 'net_unittests', |
| 1493 ], | 1504 ], |
| 1494 'conditions': [ | 1505 'conditions': [ |
| 1495 ['v8_use_external_startup_data==1', { | 1506 ['v8_use_external_startup_data==1', { |
| 1496 'dependencies': [ | 1507 'dependencies': [ |
| 1497 '../v8/tools/gyp/v8.gyp:v8_external_snapshot', | 1508 '../v8/tools/gyp/v8.gyp:v8_external_snapshot', |
| 1498 ], | 1509 ], |
| 1499 'copies': [ | 1510 'copies': [ |
| 1500 { | 1511 { |
| 1501 'destination': '<(asset_location)', | 1512 'destination': '<(asset_location)', |
| 1502 'files': [ | 1513 'files': [ |
| 1503 '<(PRODUCT_DIR)/natives_blob.bin', | 1514 '<(PRODUCT_DIR)/natives_blob.bin', |
| 1504 '<(PRODUCT_DIR)/snapshot_blob.bin', | 1515 '<(PRODUCT_DIR)/snapshot_blob.bin', |
| 1505 ], | 1516 ], |
| 1506 }, | 1517 }, |
| 1507 ], | 1518 ], |
| 1508 }], | 1519 }], |
| 1509 ], | 1520 ], |
| 1510 'variables': { | 1521 'variables': { |
| 1511 'test_suite_name': 'net_unittests', | 1522 'test_suite_name': 'net_unittests', |
| 1512 'isolate_file': 'net_unittests.isolate', | 1523 'isolate_file': 'net_unittests.isolate', |
| 1524 'android_manifest_path': 'android/unittest_support/AndroidManifest.x
ml', |
| 1525 'resource_dir': 'android/unittest_support/res', |
| 1513 'conditions': [ | 1526 'conditions': [ |
| 1514 ['v8_use_external_startup_data==1', { | 1527 ['v8_use_external_startup_data==1', { |
| 1515 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', | 1528 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', |
| 1516 'additional_input_paths': [ | 1529 'additional_input_paths': [ |
| 1517 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin', | 1530 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin', |
| 1518 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin', | 1531 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin', |
| 1519 ], | 1532 ], |
| 1520 'inputs': [ | 1533 'inputs': [ |
| 1521 '<(PRODUCT_DIR)/natives_blob.bin', | 1534 '<(PRODUCT_DIR)/natives_blob.bin', |
| 1522 '<(PRODUCT_DIR)/snapshot_blob.bin', | 1535 '<(PRODUCT_DIR)/snapshot_blob.bin', |
| 1523 ], | 1536 ], |
| 1524 }], | 1537 }], |
| 1525 ], | 1538 ], |
| 1526 }, | 1539 }, |
| 1527 'includes': [ '../build/apk_test.gypi' ], | 1540 'includes': [ '../build/apk_test.gypi' ], |
| 1528 }, | 1541 }, |
| 1542 { |
| 1543 'target_name': 'net_junit_tests', |
| 1544 'type': 'none', |
| 1545 'dependencies': [ |
| 1546 'net_java', |
| 1547 '../base/base.gyp:base', |
| 1548 '../base/base.gyp:base_java_test_support', |
| 1549 '../testing/android/junit/junit_test.gyp:junit_test_support', |
| 1550 ], |
| 1551 'variables': { |
| 1552 'main_class': 'org.chromium.testing.local.JunitTestMain', |
| 1553 'src_paths': [ |
| 1554 'android/junit/', |
| 1555 ], |
| 1556 }, |
| 1557 'includes': [ |
| 1558 '../build/host_jar.gypi', |
| 1559 ], |
| 1560 }, |
| 1561 |
| 1529 ], | 1562 ], |
| 1530 }], | 1563 }], |
| 1531 ['OS == "android" or OS == "linux"', { | 1564 ['OS == "android" or OS == "linux"', { |
| 1532 'targets': [ | 1565 'targets': [ |
| 1533 { | 1566 { |
| 1534 'target_name': 'disk_cache_memory_test', | 1567 'target_name': 'disk_cache_memory_test', |
| 1535 'type': 'executable', | 1568 'type': 'executable', |
| 1536 'dependencies': [ | 1569 'dependencies': [ |
| 1537 '../base/base.gyp:base', | 1570 '../base/base.gyp:base', |
| 1538 'net', | 1571 'net', |
| (...skipping 16 matching lines...) Expand all Loading... |
| 1555 '../build/isolate.gypi', | 1588 '../build/isolate.gypi', |
| 1556 ], | 1589 ], |
| 1557 'sources': [ | 1590 'sources': [ |
| 1558 'net_unittests.isolate', | 1591 'net_unittests.isolate', |
| 1559 ], | 1592 ], |
| 1560 }, | 1593 }, |
| 1561 ], | 1594 ], |
| 1562 }], | 1595 }], |
| 1563 ], | 1596 ], |
| 1564 } | 1597 } |
| OLD | NEW |