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

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: Deal with comments and build and test failures. Created 5 years, 6 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
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', 232 'http/http_auth_handler_negotiate_unittest.cc',
230 'http/mock_gssapi_library_posix.cc', 233 'http/mock_gssapi_library_posix.cc',
231 'http/mock_gssapi_library_posix.h', 234 'http/mock_gssapi_library_posix.h',
232 ], 235 ],
233 }], 236 }],
234 [ 'use_openssl == 1 or (desktop_linux == 0 and chromeos == 0 and OS != " ios")', { 237 [ '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 238 # Only include this test when on Posix and using NSS for
236 # cert verification or on iOS (which also uses NSS for certs). 239 # cert verification or on iOS (which also uses NSS for certs).
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 }, 1349 },
1347 { 1350 {
1348 'target_name': 'net_jni_headers', 1351 'target_name': 'net_jni_headers',
1349 'type': 'none', 1352 'type': 'none',
1350 'sources': [ 1353 'sources': [
1351 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 1354 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java',
1352 'android/java/src/org/chromium/net/AndroidKeyStore.java', 1355 'android/java/src/org/chromium/net/AndroidKeyStore.java',
1353 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 1356 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
1354 'android/java/src/org/chromium/net/AndroidPrivateKey.java', 1357 'android/java/src/org/chromium/net/AndroidPrivateKey.java',
1355 'android/java/src/org/chromium/net/GURLUtils.java', 1358 'android/java/src/org/chromium/net/GURLUtils.java',
1359 'android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java',
1356 'android/java/src/org/chromium/net/NetStringUtil.java', 1360 'android/java/src/org/chromium/net/NetStringUtil.java',
1357 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 1361 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
1358 'android/java/src/org/chromium/net/ProxyChangeListener.java', 1362 'android/java/src/org/chromium/net/ProxyChangeListener.java',
1359 'android/java/src/org/chromium/net/X509Util.java', 1363 'android/java/src/org/chromium/net/X509Util.java',
1360 ], 1364 ],
1361 'variables': { 1365 'variables': {
1362 'jni_gen_package': 'net', 1366 'jni_gen_package': 'net',
1363 }, 1367 },
1364 'includes': [ '../build/jni_generator.gypi' ], 1368 'includes': [ '../build/jni_generator.gypi' ],
1365 }, 1369 },
1366 { 1370 {
1367 'target_name': 'net_test_jni_headers', 1371 'target_name': 'net_test_jni_headers',
1368 'type': 'none', 1372 'type': 'none',
1369 'sources': [ 1373 'sources': [
1370 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ', 1374 'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java ',
1375 'test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthent icator.java',
1371 ], 1376 ],
1372 'variables': { 1377 'variables': {
1373 'jni_gen_package': 'net', 1378 'jni_gen_package': 'net',
1374 }, 1379 },
1375 'includes': [ '../build/jni_generator.gypi' ], 1380 'includes': [ '../build/jni_generator.gypi' ],
1376 }, 1381 },
1377 { 1382 {
1378 'target_name': 'net_java', 1383 'target_name': 'net_java',
1379 'type': 'none', 1384 'type': 'none',
1380 'variables': { 1385 'variables': {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1482 'source_file': 'android/keystore.h', 1487 'source_file': 'android/keystore.h',
1483 }, 1488 },
1484 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1489 'includes': [ '../build/android/java_cpp_enum.gypi' ],
1485 }, 1490 },
1486 { 1491 {
1487 'target_name': 'net_unittests_apk', 1492 'target_name': 'net_unittests_apk',
1488 'type': 'none', 1493 'type': 'none',
1489 'dependencies': [ 1494 'dependencies': [
1490 'net_java', 1495 'net_java',
1491 'net_javatests', 1496 'net_javatests',
1497 'net_java_test_support',
1492 'net_unittests', 1498 'net_unittests',
1493 ], 1499 ],
1494 'conditions': [ 1500 'conditions': [
1495 ['v8_use_external_startup_data==1', { 1501 ['v8_use_external_startup_data==1', {
1496 'dependencies': [ 1502 'dependencies': [
1497 '../v8/tools/gyp/v8.gyp:v8_external_snapshot', 1503 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
1498 ], 1504 ],
1499 'copies': [ 1505 'copies': [
1500 { 1506 {
1501 'destination': '<(asset_location)', 1507 'destination': '<(asset_location)',
1502 'files': [ 1508 'files': [
1503 '<(PRODUCT_DIR)/natives_blob.bin', 1509 '<(PRODUCT_DIR)/natives_blob.bin',
1504 '<(PRODUCT_DIR)/snapshot_blob.bin', 1510 '<(PRODUCT_DIR)/snapshot_blob.bin',
1505 ], 1511 ],
1506 }, 1512 },
1507 ], 1513 ],
1508 }], 1514 }],
1509 ], 1515 ],
1510 'variables': { 1516 'variables': {
1511 'test_suite_name': 'net_unittests', 1517 'test_suite_name': 'net_unittests',
1512 'isolate_file': 'net_unittests.isolate', 1518 'isolate_file': 'net_unittests.isolate',
1519 'android_manifest_path': 'android/unittest_support/AndroidManifest.x ml',
1520 'resource_dir': 'android/unittest_support/res',
1513 'conditions': [ 1521 'conditions': [
1514 ['v8_use_external_startup_data==1', { 1522 ['v8_use_external_startup_data==1', {
1515 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', 1523 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets',
1516 'additional_input_paths': [ 1524 'additional_input_paths': [
1517 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin', 1525 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin',
1518 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin', 1526 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin',
1519 ], 1527 ],
1520 'inputs': [ 1528 'inputs': [
1521 '<(PRODUCT_DIR)/natives_blob.bin', 1529 '<(PRODUCT_DIR)/natives_blob.bin',
1522 '<(PRODUCT_DIR)/snapshot_blob.bin', 1530 '<(PRODUCT_DIR)/snapshot_blob.bin',
1523 ], 1531 ],
1524 }], 1532 }],
1525 ], 1533 ],
1526 }, 1534 },
1527 'includes': [ '../build/apk_test.gypi' ], 1535 'includes': [ '../build/apk_test.gypi' ],
1528 }, 1536 },
1537 {
1538 'target_name': 'net_junit_tests',
1539 'type': 'none',
1540 'dependencies': [
1541 'net_java',
1542 '../base/base.gyp:base',
1543 '../base/base.gyp:base_java_test_support',
1544 '../testing/android/junit/junit_test.gyp:junit_test_support',
1545 ],
1546 'variables': {
1547 'main_class': 'org.chromium.testing.local.JunitTestMain',
1548 'src_paths': [
1549 'android/junit/',
1550 ],
1551 },
1552 'includes': [
1553 '../build/host_jar.gypi',
1554 ],
1555 },
1556
1529 ], 1557 ],
1530 }], 1558 }],
1531 ['OS == "android" or OS == "linux"', { 1559 ['OS == "android" or OS == "linux"', {
1532 'targets': [ 1560 'targets': [
1533 { 1561 {
1534 'target_name': 'disk_cache_memory_test', 1562 'target_name': 'disk_cache_memory_test',
1535 'type': 'executable', 1563 'type': 'executable',
1536 'dependencies': [ 1564 'dependencies': [
1537 '../base/base.gyp:base', 1565 '../base/base.gyp:base',
1538 'net', 1566 'net',
(...skipping 16 matching lines...) Expand all
1555 '../build/isolate.gypi', 1583 '../build/isolate.gypi',
1556 ], 1584 ],
1557 'sources': [ 1585 'sources': [
1558 'net_unittests.isolate', 1586 'net_unittests.isolate',
1559 ], 1587 ],
1560 }, 1588 },
1561 ], 1589 ],
1562 }], 1590 }],
1563 ], 1591 ],
1564 } 1592 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698