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

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 compile errors caused by trying to forward declare a typedef 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 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 }, 1355 },
1349 { 1356 {
1350 'target_name': 'net_jni_headers', 1357 'target_name': 'net_jni_headers',
1351 'type': 'none', 1358 'type': 'none',
1352 'sources': [ 1359 'sources': [
1353 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 1360 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
1354 'android/java/src/org/chromium/net/AndroidKeyStore.java', 1361 'android/java/src/org/chromium/net/AndroidKeyStore.java',
1355 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 1362 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
1356 'android/java/src/org/chromium/net/AndroidPrivateKey.java', 1363 'android/java/src/org/chromium/net/AndroidPrivateKey.java',
1357 'android/java/src/org/chromium/net/GURLUtils.java', 1364 'android/java/src/org/chromium/net/GURLUtils.java',
1365 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java',
1358 'android/java/src/org/chromium/net/NetStringUtil.java', 1366 'android/java/src/org/chromium/net/NetStringUtil.java',
1359 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 1367 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
1360 'android/java/src/org/chromium/net/ProxyChangeListener.java', 1368 'android/java/src/org/chromium/net/ProxyChangeListener.java',
1361 'android/java/src/org/chromium/net/X509Util.java', 1369 'android/java/src/org/chromium/net/X509Util.java',
1362 ], 1370 ],
1363 'variables': { 1371 'variables': {
1364 'jni_gen_package': 'net', 1372 'jni_gen_package': 'net',
1365 }, 1373 },
1366 'includes': [ '../build/jni_generator.gypi' ], 1374 'includes': [ '../build/jni_generator.gypi' ],
1367 }, 1375 },
1368 { 1376 {
1369 'target_name': 'net_test_jni_headers', 1377 'target_name': 'net_test_jni_headers',
1370 'type': 'none', 1378 'type': 'none',
1371 'sources': [ 1379 'sources': [
1372 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ', 1380 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ',
1373 'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer .java', 1381 'test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer .java',
1382 'test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthent icator.java',
1374 ], 1383 ],
1375 'variables': { 1384 'variables': {
1376 'jni_gen_package': 'net/test', 1385 'jni_gen_package': 'net/test',
1377 }, 1386 },
1378 'includes': [ '../build/jni_generator.gypi' ], 1387 'includes': [ '../build/jni_generator.gypi' ],
1379 }, 1388 },
1380 { 1389 {
1381 'target_name': 'net_java', 1390 'target_name': 'net_java',
1382 'type': 'none', 1391 'type': 'none',
1383 'variables': { 1392 'variables': {
(...skipping 27 matching lines...) Expand all
1411 { 1420 {
1412 'target_name': 'net_java_test_support', 1421 'target_name': 'net_java_test_support',
1413 'type': 'none', 1422 'type': 'none',
1414 'variables': { 1423 'variables': {
1415 'java_in_dir': '../net/test/android/javatests', 1424 'java_in_dir': '../net/test/android/javatests',
1416 }, 1425 },
1417 'dependencies': [ 1426 'dependencies': [
1418 'net_test_support', 1427 'net_test_support',
1419 'url_request_failed_job_java', 1428 'url_request_failed_job_java',
1420 '../base/base.gyp:base_java', 1429 '../base/base.gyp:base_java',
1430 'net_java',
1421 '<@(net_test_extra_libs)', 1431 '<@(net_test_extra_libs)',
1422 ], 1432 ],
1423 'includes': [ '../build/java.gypi' ], 1433 'includes': [ '../build/java.gypi' ],
1424 }, 1434 },
1425 { 1435 {
1426 'target_name': 'url_request_failed_job_java', 1436 'target_name': 'url_request_failed_job_java',
1427 'type': 'none', 1437 'type': 'none',
1428 'variables': { 1438 'variables': {
1429 'source_file': 'test/url_request/url_request_failed_job.h', 1439 'source_file': 'test/url_request/url_request_failed_job.h',
1430 }, 1440 },
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 'source_file': 'android/keystore.h', 1496 'source_file': 'android/keystore.h',
1487 }, 1497 },
1488 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1498 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1489 }, 1499 },
1490 { 1500 {
1491 'target_name': 'net_unittests_apk', 1501 'target_name': 'net_unittests_apk',
1492 'type': 'none', 1502 'type': 'none',
1493 'dependencies': [ 1503 'dependencies': [
1494 'net_java', 1504 'net_java',
1495 'net_javatests', 1505 'net_javatests',
1506 'net_java_test_support',
1496 'net_unittests', 1507 'net_unittests',
1497 ], 1508 ],
1498 'conditions': [ 1509 'conditions': [
1499 ['v8_use_external_startup_data==1', { 1510 ['v8_use_external_startup_data==1', {
1500 'dependencies': [ 1511 'dependencies': [
1501 '../v8/tools/gyp/v8.gyp:v8_external_snapshot', 1512 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
1502 ], 1513 ],
1503 'copies': [ 1514 'copies': [
1504 { 1515 {
1505 'destination': '<(asset_location)', 1516 'destination': '<(asset_location)',
1506 'files': [ 1517 'files': [
1507 '<(PRODUCT_DIR)/natives_blob.bin', 1518 '<(PRODUCT_DIR)/natives_blob.bin',
1508 '<(PRODUCT_DIR)/snapshot_blob.bin', 1519 '<(PRODUCT_DIR)/snapshot_blob.bin',
1509 ], 1520 ],
1510 }, 1521 },
1511 ], 1522 ],
1512 }], 1523 }],
1513 ], 1524 ],
1514 'variables': { 1525 'variables': {
1515 'test_suite_name': 'net_unittests', 1526 'test_suite_name': 'net_unittests',
1516 'isolate_file': 'net_unittests.isolate', 1527 'isolate_file': 'net_unittests.isolate',
1528 'android_manifest_path': 'android/unittest_support/AndroidManifest.x ml',
1529 'resource_dir': 'android/unittest_support/res',
1517 'conditions': [ 1530 'conditions': [
1518 ['v8_use_external_startup_data==1', { 1531 ['v8_use_external_startup_data==1', {
1519 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', 1532 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets',
1520 'additional_input_paths': [ 1533 'additional_input_paths': [
1521 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin', 1534 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin',
1522 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin', 1535 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin',
1523 ], 1536 ],
1524 'inputs': [ 1537 'inputs': [
1525 '<(PRODUCT_DIR)/natives_blob.bin', 1538 '<(PRODUCT_DIR)/natives_blob.bin',
1526 '<(PRODUCT_DIR)/snapshot_blob.bin', 1539 '<(PRODUCT_DIR)/snapshot_blob.bin',
1527 ], 1540 ],
1528 }], 1541 }],
1529 ], 1542 ],
1530 }, 1543 },
1531 'includes': [ '../build/apk_test.gypi' ], 1544 'includes': [ '../build/apk_test.gypi' ],
1532 }, 1545 },
1546 {
1547 'target_name': 'net_junit_tests',
1548 'type': 'none',
1549 'dependencies': [
1550 'net_java',
1551 '../base/base.gyp:base',
1552 '../base/base.gyp:base_java_test_support',
1553 '../testing/android/junit/junit_test.gyp:junit_test_support',
1554 ],
1555 'variables': {
1556 'main_class': 'org.chromium.testing.local.JunitTestMain',
1557 'src_paths': [
1558 'android/junit/',
1559 ],
1560 },
1561 'includes': [
1562 '../build/host_jar.gypi',
1563 ],
1564 },
1565
1533 ], 1566 ],
1534 }], 1567 }],
1535 ['OS == "android" or OS == "linux"', { 1568 ['OS == "android" or OS == "linux"', {
1536 'targets': [ 1569 'targets': [
1537 { 1570 {
1538 'target_name': 'disk_cache_memory_test', 1571 'target_name': 'disk_cache_memory_test',
1539 'type': 'executable', 1572 'type': 'executable',
1540 'dependencies': [ 1573 'dependencies': [
1541 '../base/base.gyp:base', 1574 '../base/base.gyp:base',
1542 'net', 1575 'net',
(...skipping 16 matching lines...) Expand all
1559 '../build/isolate.gypi', 1592 '../build/isolate.gypi',
1560 ], 1593 ],
1561 'sources': [ 1594 'sources': [
1562 'net_unittests.isolate', 1595 'net_unittests.isolate',
1563 ], 1596 ],
1564 }, 1597 },
1565 ], 1598 ],
1566 }], 1599 }],
1567 ], 1600 ],
1568 } 1601 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698