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

Side by Side Diff: net/net.gyp

Issue 7655046: Linux: allow linking directly with Kerberos instead of using dlopen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Hopefully fix ChromeOS Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « net/http/mock_gssapi_library_posix.cc ('k') | net/third_party/gssapi/LICENSE » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 8
9 'use_kerberos%': 1, 9 'linux_link_kerberos%': 0,
10 'conditions': [
11 ['chromeos==1', {
12 # Disable Kerberos on ChromeOS, at least for now.
13 # It needs configuration (krb5.conf and so on).
14 'use_kerberos%': 0,
15 }, { # chromeos == 0
16 'use_kerberos%': 1,
17 }],
18 ],
10 }, 19 },
11 'targets': [ 20 'targets': [
12 { 21 {
13 'target_name': 'net', 22 'target_name': 'net',
14 'type': '<(component)', 23 'type': '<(component)',
15 'dependencies': [ 24 'dependencies': [
16 '../base/base.gyp:base', 25 '../base/base.gyp:base',
17 '../base/base.gyp:base_i18n', 26 '../base/base.gyp:base_i18n',
18 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 27 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
19 '../build/temp_gyp/googleurl.gyp:googleurl', 28 '../build/temp_gyp/googleurl.gyp:googleurl',
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 ['chromeos==1', { 712 ['chromeos==1', {
704 'sources!': [ 713 'sources!': [
705 'proxy/proxy_config_service_linux.cc', 714 'proxy/proxy_config_service_linux.cc',
706 'proxy/proxy_config_service_linux.h', 715 'proxy/proxy_config_service_linux.h',
707 ], 716 ],
708 }], 717 }],
709 ['use_kerberos==1', { 718 ['use_kerberos==1', {
710 'defines': [ 719 'defines': [
711 'USE_KERBEROS', 720 'USE_KERBEROS',
712 ], 721 ],
722 'conditions': [
723 ['linux_link_kerberos==1', {
724 'link_settings': {
725 'ldflags': [
726 '<!@(krb5-config --libs gssapi)',
727 ],
728 },
729 }, { # linux_link_kerberos==0
730 'defines': [
731 'DLOPEN_KERBEROS',
732 ],
733 }],
734 ],
713 }, { # use_kerberos == 0 735 }, { # use_kerberos == 0
714 'sources!': [ 736 'sources!': [
715 'http/http_auth_gssapi_posix.cc', 737 'http/http_auth_gssapi_posix.cc',
716 'http/http_auth_gssapi_posix.h', 738 'http/http_auth_gssapi_posix.h',
717 'http/http_auth_handler_negotiate.h', 739 'http/http_auth_handler_negotiate.h',
718 'http/http_auth_handler_negotiate.cc', 740 'http/http_auth_handler_negotiate.cc',
719 ], 741 ],
720 }], 742 }],
721 ['use_openssl==1', { 743 ['use_openssl==1', {
722 'sources!': [ 744 'sources!': [
(...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after
1520 'tools/dump_cache/url_to_filename_encoder.cc', 1542 'tools/dump_cache/url_to_filename_encoder.cc',
1521 'tools/dump_cache/url_to_filename_encoder.h', 1543 'tools/dump_cache/url_to_filename_encoder.h',
1522 'tools/dump_cache/url_utilities.h', 1544 'tools/dump_cache/url_utilities.h',
1523 'tools/dump_cache/url_utilities.cc', 1545 'tools/dump_cache/url_utilities.cc',
1524 ], 1546 ],
1525 }, 1547 },
1526 ], 1548 ],
1527 }], 1549 }],
1528 ], 1550 ],
1529 } 1551 }
OLDNEW
« no previous file with comments | « net/http/mock_gssapi_library_posix.cc ('k') | net/third_party/gssapi/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698