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

Side by Side Diff: net/net.gyp

Issue 8336024: OpenBSD patches for net, split from CR #8275005 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: add missing crypto patch Created 9 years, 2 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 (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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 'process_outputs_as_sources': 1, 722 'process_outputs_as_sources': 1,
723 }, 723 },
724 ], 724 ],
725 'conditions': [ 725 'conditions': [
726 ['chromeos==1', { 726 ['chromeos==1', {
727 'sources!': [ 727 'sources!': [
728 'proxy/proxy_config_service_linux.cc', 728 'proxy/proxy_config_service_linux.cc',
729 'proxy/proxy_config_service_linux.h', 729 'proxy/proxy_config_service_linux.h',
730 ], 730 ],
731 }], 731 }],
732 ['OS=="openbsd"', {
733 'sources': [
734 'base/platform_mime_util_linux.cc',
735 ],
736 }],
732 ['use_kerberos==1', { 737 ['use_kerberos==1', {
733 'defines': [ 738 'defines': [
734 'USE_KERBEROS', 739 'USE_KERBEROS',
735 ], 740 ],
736 'conditions': [ 741 'conditions': [
737 ['linux_link_kerberos==1', { 742 ['linux_link_kerberos==1', {
738 'link_settings': { 743 'link_settings': {
739 'ldflags': [ 744 'ldflags': [
740 '<!@(krb5-config --libs gssapi)', 745 '<!@(krb5-config --libs gssapi)',
741 ], 746 ],
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 'socket/ssl_client_socket_openssl.cc', 804 'socket/ssl_client_socket_openssl.cc',
800 'socket/ssl_client_socket_openssl.h', 805 'socket/ssl_client_socket_openssl.h',
801 'socket/ssl_server_socket_openssl.cc', 806 'socket/ssl_server_socket_openssl.cc',
802 ], 807 ],
803 }, 808 },
804 ], 809 ],
805 [ 'use_glib == 1', { 810 [ 'use_glib == 1', {
806 'dependencies': [ 811 'dependencies': [
807 '../build/linux/system.gyp:gconf', 812 '../build/linux/system.gyp:gconf',
808 '../build/linux/system.gyp:gio', 813 '../build/linux/system.gyp:gio',
809 '../build/linux/system.gyp:libresolv',
810 ], 814 ],
811 'conditions': [ 815 'conditions': [
812 ['use_openssl==1', { 816 ['use_openssl==1', {
813 'dependencies': [ 817 'dependencies': [
814 '../third_party/openssl/openssl.gyp:openssl', 818 '../third_party/openssl/openssl.gyp:openssl',
815 ], 819 ],
816 }, 820 },
817 { # else use_openssl==0, use NSS 821 { # else use_openssl==0, use NSS
818 'dependencies': [ 822 'dependencies': [
819 '../build/linux/system.gyp:ssl', 823 '../build/linux/system.gyp:ssl',
820 ], 824 ],
821 }], 825 }],
826 ['OS!="openbsd"', {
827 'dependencies': [
828 '../build/linux/system.gyp:libresolv',
829 ],
830 }],
822 ['OS=="solaris"', { 831 ['OS=="solaris"', {
823 'link_settings': { 832 'link_settings': {
824 'ldflags': [ 833 'ldflags': [
825 '-R/usr/lib/mps', 834 '-R/usr/lib/mps',
826 ], 835 ],
827 }, 836 },
828 }], 837 }],
829 ], 838 ],
830 }, 839 },
831 { # else: OS is not in the above list 840 { # else: OS is not in the above list
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 # Android can shut down our app at any time, so we persist session cookies. 909 # Android can shut down our app at any time, so we persist session cookies.
901 'ENABLE_PERSISTENT_SESSION_COOKIES' 910 'ENABLE_PERSISTENT_SESSION_COOKIES'
902 ], 911 ],
903 }, { # else OS! = "android" 912 }, { # else OS! = "android"
904 'defines': [ 913 'defines': [
905 # These are the features Android doesn't support. 914 # These are the features Android doesn't support.
906 'ENABLE_MEDIA_CODEC_THEORA', 915 'ENABLE_MEDIA_CODEC_THEORA',
907 'ENABLE_MEDIA_TYPE_OGG', 916 'ENABLE_MEDIA_TYPE_OGG',
908 ], 917 ],
909 }, 918 },
910 ], 919 ],
wtc 2011/10/18 21:50:26 Nit: it may be better to move the OS=="openbsd" co
911 ], 920 ],
912 }, 921 },
913 { 922 {
914 'target_name': 'net_unittests', 923 'target_name': 'net_unittests',
915 'type': 'executable', 924 'type': 'executable',
916 'dependencies': [ 925 'dependencies': [
917 'net', 926 'net',
918 'net_test_support', 927 'net_test_support',
919 '../base/base.gyp:base', 928 '../base/base.gyp:base',
920 '../base/base.gyp:base_i18n', 929 '../base/base.gyp:base_i18n',
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 'tools/dump_cache/url_to_filename_encoder.cc', 1587 'tools/dump_cache/url_to_filename_encoder.cc',
1579 'tools/dump_cache/url_to_filename_encoder.h', 1588 'tools/dump_cache/url_to_filename_encoder.h',
1580 'tools/dump_cache/url_utilities.h', 1589 'tools/dump_cache/url_utilities.h',
1581 'tools/dump_cache/url_utilities.cc', 1590 'tools/dump_cache/url_utilities.cc',
1582 ], 1591 ],
1583 }, 1592 },
1584 ], 1593 ],
1585 }], 1594 }],
1586 ], 1595 ],
1587 } 1596 }
OLDNEW
« net/dns/dns_config_service_posix.cc ('K') | « net/dns/dns_config_service_posix.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698