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

Side by Side Diff: net/net.gyp

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cbentzel@'s nits Created 5 years, 5 months 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
OLDNEW
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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 'dependencies': [ 215 'dependencies': [
216 '../base/allocator/allocator.gyp:allocator', 216 '../base/allocator/allocator.gyp:allocator',
217 ], 217 ],
218 }], 218 }],
219 ], 219 ],
220 }], 220 }],
221 [ 'use_kerberos==1', { 221 [ 'use_kerberos==1', {
222 'defines': [ 222 'defines': [
223 'USE_KERBEROS', 223 'USE_KERBEROS',
224 ], 224 ],
225 }, { # use_kerberos == 0 225 }],
226 [ 'use_kerberos==0 or OS == "android"', {
227 # These are excluded on Android, because the actual Kerberos support,
228 # which these test, is in a separate app on Android.
226 'sources!': [ 229 'sources!': [
227 'http/http_auth_gssapi_posix_unittest.cc', 230 'http/http_auth_gssapi_posix_unittest.cc',
228 'http/http_auth_handler_negotiate_unittest.cc',
229 'http/mock_gssapi_library_posix.cc', 231 'http/mock_gssapi_library_posix.cc',
230 'http/mock_gssapi_library_posix.h', 232 'http/mock_gssapi_library_posix.h',
231 ], 233 ],
232 }], 234 }],
235 [ 'use_kerberos==0', {
236 'sources!': [
237 'http/http_auth_handler_negotiate_unittest.cc',
238 ],
239 }],
233 [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != " ios")', { 240 [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != " ios")', {
234 # Only include this test when on Posix and using NSS for 241 # Only include this test when on Posix and using NSS for
235 # cert verification or on iOS (which also uses NSS for certs). 242 # cert verification or on iOS (which also uses NSS for certs).
236 'sources!': [ 243 'sources!': [
237 'cert_net/nss_ocsp_unittest.cc', 244 'cert_net/nss_ocsp_unittest.cc',
238 ], 245 ],
239 }], 246 }],
240 [ 'use_openssl==1', { 247 [ 'use_openssl==1', {
241 # When building for OpenSSL, we need to exclude NSS specific tests 248 # When building for OpenSSL, we need to exclude NSS specific tests
242 # or functionality not supported by OpenSSL yet. 249 # or functionality not supported by OpenSSL yet.
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 }, 1354 },
1348 { 1355 {
1349 'target_name': 'net_jni_headers', 1356 'target_name': 'net_jni_headers',
1350 'type': 'none', 1357 'type': 'none',
1351 'sources': [ 1358 'sources': [
1352 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 1359 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
1353 'android/java/src/org/chromium/net/AndroidKeyStore.java', 1360 'android/java/src/org/chromium/net/AndroidKeyStore.java',
1354 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 1361 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
1355 'android/java/src/org/chromium/net/AndroidPrivateKey.java', 1362 'android/java/src/org/chromium/net/AndroidPrivateKey.java',
1356 'android/java/src/org/chromium/net/GURLUtils.java', 1363 'android/java/src/org/chromium/net/GURLUtils.java',
1364 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java',
1357 'android/java/src/org/chromium/net/NetStringUtil.java', 1365 'android/java/src/org/chromium/net/NetStringUtil.java',
1358 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 1366 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
1359 'android/java/src/org/chromium/net/ProxyChangeListener.java', 1367 'android/java/src/org/chromium/net/ProxyChangeListener.java',
1360 'android/java/src/org/chromium/net/X509Util.java', 1368 'android/java/src/org/chromium/net/X509Util.java',
1361 ], 1369 ],
1362 'variables': { 1370 'variables': {
1363 'jni_gen_package': 'net', 1371 'jni_gen_package': 'net',
1364 }, 1372 },
1365 'includes': [ '../build/jni_generator.gypi' ], 1373 'includes': [ '../build/jni_generator.gypi' ],
1366 }, 1374 },
1367 { 1375 {
1368 'target_name': 'net_test_jni_headers', 1376 'target_name': 'net_test_jni_headers',
1369 'type': 'none', 1377 'type': 'none',
1370 'sources': [ 1378 'sources': [
1371 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ', 1379 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ',
1372 'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer .java', 1380 'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer .java',
1381 'test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthent icator.java',
1373 ], 1382 ],
1374 'variables': { 1383 'variables': {
1375 'jni_gen_package': 'net/test', 1384 'jni_gen_package': 'net/test',
1376 }, 1385 },
1377 'includes': [ '../build/jni_generator.gypi' ], 1386 'includes': [ '../build/jni_generator.gypi' ],
1378 }, 1387 },
1379 { 1388 {
1380 'target_name': 'net_java', 1389 'target_name': 'net_java',
1381 'type': 'none', 1390 'type': 'none',
1382 'variables': { 1391 'variables': {
(...skipping 27 matching lines...) Expand all
1410 { 1419 {
1411 'target_name': 'net_java_test_support', 1420 'target_name': 'net_java_test_support',
1412 'type': 'none', 1421 'type': 'none',
1413 'variables': { 1422 'variables': {
1414 'java_in_dir': '../net/test/android/javatests', 1423 'java_in_dir': '../net/test/android/javatests',
1415 }, 1424 },
1416 'dependencies': [ 1425 'dependencies': [
1417 'net_test_support', 1426 'net_test_support',
1418 'url_request_failed_job_java', 1427 'url_request_failed_job_java',
1419 '../base/base.gyp:base_java', 1428 '../base/base.gyp:base_java',
1429 'net_java',
1420 '<@(net_test_extra_libs)', 1430 '<@(net_test_extra_libs)',
1421 ], 1431 ],
1422 'includes': [ '../build/java.gypi' ], 1432 'includes': [ '../build/java.gypi' ],
1423 }, 1433 },
1424 { 1434 {
1425 'target_name': 'url_request_failed_job_java', 1435 'target_name': 'url_request_failed_job_java',
1426 'type': 'none', 1436 'type': 'none',
1427 'variables': { 1437 'variables': {
1428 'source_file': 'test/url_request/url_request_failed_job.h', 1438 'source_file': 'test/url_request/url_request_failed_job.h',
1429 }, 1439 },
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1485 'source_file': 'android/keystore.h', 1495 'source_file': 'android/keystore.h',
1486 }, 1496 },
1487 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1497 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1488 }, 1498 },
1489 { 1499 {
1490 'target_name': 'net_unittests_apk', 1500 'target_name': 'net_unittests_apk',
1491 'type': 'none', 1501 'type': 'none',
1492 'dependencies': [ 1502 'dependencies': [
1493 'net_java', 1503 'net_java',
1494 'net_javatests', 1504 'net_javatests',
1505 'net_java_test_support',
1495 'net_unittests', 1506 'net_unittests',
1496 ], 1507 ],
1497 'conditions': [ 1508 'conditions': [
1498 ['v8_use_external_startup_data==1', { 1509 ['v8_use_external_startup_data==1', {
1499 'dependencies': [ 1510 'dependencies': [
1500 '../v8/tools/gyp/v8.gyp:v8_external_snapshot', 1511 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
1501 ], 1512 ],
1502 'copies': [ 1513 'copies': [
1503 { 1514 {
1504 'destination': '<(asset_location)', 1515 'destination': '<(asset_location)',
1505 'files': [ 1516 'files': [
1506 '<(PRODUCT_DIR)/natives_blob.bin', 1517 '<(PRODUCT_DIR)/natives_blob.bin',
1507 '<(PRODUCT_DIR)/snapshot_blob.bin', 1518 '<(PRODUCT_DIR)/snapshot_blob.bin',
1508 ], 1519 ],
1509 }, 1520 },
1510 ], 1521 ],
1511 }], 1522 }],
1512 ], 1523 ],
1513 'variables': { 1524 'variables': {
1514 'test_suite_name': 'net_unittests', 1525 'test_suite_name': 'net_unittests',
1515 'isolate_file': 'net_unittests.isolate', 1526 'isolate_file': 'net_unittests.isolate',
1527 'android_manifest_path': 'android/unittest_support/AndroidManifest.x ml',
1528 'resource_dir': 'android/unittest_support/res',
1516 'conditions': [ 1529 'conditions': [
1517 ['v8_use_external_startup_data==1', { 1530 ['v8_use_external_startup_data==1', {
1518 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', 1531 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets',
1519 'additional_input_paths': [ 1532 'additional_input_paths': [
1520 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin', 1533 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin',
1521 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin', 1534 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin',
1522 ], 1535 ],
1523 'inputs': [ 1536 'inputs': [
1524 '<(PRODUCT_DIR)/natives_blob.bin', 1537 '<(PRODUCT_DIR)/natives_blob.bin',
1525 '<(PRODUCT_DIR)/snapshot_blob.bin', 1538 '<(PRODUCT_DIR)/snapshot_blob.bin',
1526 ], 1539 ],
1527 }], 1540 }],
1528 ], 1541 ],
1529 }, 1542 },
1530 'includes': [ '../build/apk_test.gypi' ], 1543 'includes': [ '../build/apk_test.gypi' ],
1531 }, 1544 },
1545 {
1546 'target_name': 'net_junit_tests',
1547 'type': 'none',
1548 'dependencies': [
1549 'net_java',
1550 '../base/base.gyp:base',
1551 '../base/base.gyp:base_java_test_support',
1552 '../testing/android/junit/junit_test.gyp:junit_test_support',
1553 ],
1554 'variables': {
1555 'main_class': 'org.chromium.testing.local.JunitTestMain',
1556 'src_paths': [
1557 'android/junit/',
1558 ],
1559 },
1560 'includes': [
1561 '../build/host_jar.gypi',
1562 ],
1563 },
1564
1532 ], 1565 ],
1533 }], 1566 }],
1534 ['OS == "android" or OS == "linux"', { 1567 ['OS == "android" or OS == "linux"', {
1535 'targets': [ 1568 'targets': [
1536 { 1569 {
1537 'target_name': 'disk_cache_memory_test', 1570 'target_name': 'disk_cache_memory_test',
1538 'type': 'executable', 1571 'type': 'executable',
1539 'dependencies': [ 1572 'dependencies': [
1540 '../base/base.gyp:base', 1573 '../base/base.gyp:base',
1541 'net', 1574 'net',
(...skipping 16 matching lines...) Expand all
1558 '../build/isolate.gypi', 1591 '../build/isolate.gypi',
1559 ], 1592 ],
1560 'sources': [ 1593 'sources': [
1561 'net_unittests.isolate', 1594 'net_unittests.isolate',
1562 ], 1595 ],
1563 }, 1596 },
1564 ], 1597 ],
1565 }], 1598 }],
1566 ], 1599 ],
1567 } 1600 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698