| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'conditions': [ | 7 'conditions': [ |
| 8 ['sysroot!=""', { | 8 ['sysroot!=""', { |
| 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', | 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', |
| 10 }, { | 10 }, { |
| 11 'pkg-config': 'pkg-config' | 11 'pkg-config': 'pkg-config' |
| 12 }], | 12 }], |
| 13 ], | 13 ], |
| 14 | 14 |
| 15 'linux_link_libgps%': 0, | 15 'linux_link_libgps%': 0, |
| 16 'linux_link_libpci%': 0, | 16 'linux_link_libpci%': 0, |
| 17 'linux_link_libspeechd%': 0, | 17 'linux_link_libspeechd%': 0, |
| 18 'linux_link_libbrlapi%': 0, | 18 'linux_link_libbrlapi%': 0, |
| 19 }, | 19 }, |
| 20 'conditions': [ | 20 'conditions': [ |
| 21 [ 'os_posix==1 and OS!="mac"', { | |
| 22 'variables': { | |
| 23 # We use our own copy of libssl3, although we still need to link against | |
| 24 # the rest of NSS. | |
| 25 'use_system_ssl%': 0, | |
| 26 }, | |
| 27 }, { | |
| 28 'variables': { | |
| 29 'use_system_ssl%': 1, | |
| 30 }, | |
| 31 }], | |
| 32 [ 'chromeos==0', { | 21 [ 'chromeos==0', { |
| 33 # Hide GTK and related dependencies for Chrome OS, so they won't get | 22 # Hide GTK and related dependencies for Chrome OS, so they won't get |
| 34 # added back to Chrome OS. Don't try to use GTK on Chrome OS. | 23 # added back to Chrome OS. Don't try to use GTK on Chrome OS. |
| 35 'targets': [ | 24 'targets': [ |
| 36 { | 25 { |
| 37 'target_name': 'gdk', | 26 'target_name': 'gdk', |
| 38 'type': 'none', | 27 'type': 'none', |
| 39 'conditions': [ | 28 'conditions': [ |
| 40 ['_toolset=="target"', { | 29 ['_toolset=="target"', { |
| 41 'direct_dependent_settings': { | 30 'direct_dependent_settings': { |
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 706 'target_name': 'ssl', | 695 'target_name': 'ssl', |
| 707 'type': 'none', | 696 'type': 'none', |
| 708 'conditions': [ | 697 'conditions': [ |
| 709 ['_toolset=="target"', { | 698 ['_toolset=="target"', { |
| 710 'conditions': [ | 699 'conditions': [ |
| 711 ['use_openssl==1', { | 700 ['use_openssl==1', { |
| 712 'dependencies': [ | 701 'dependencies': [ |
| 713 '../../third_party/openssl/openssl.gyp:openssl', | 702 '../../third_party/openssl/openssl.gyp:openssl', |
| 714 ], | 703 ], |
| 715 }], | 704 }], |
| 716 ['use_openssl==0 and use_system_ssl==0', { | 705 ['use_openssl==0', { |
| 717 'dependencies': [ | 706 'dependencies': [ |
| 718 '../../net/third_party/nss/ssl.gyp:libssl', | 707 '../../net/third_party/nss/ssl.gyp:libssl', |
| 719 ], | 708 ], |
| 720 'direct_dependent_settings': { | 709 'direct_dependent_settings': { |
| 721 'include_dirs+': [ | 710 'include_dirs+': [ |
| 722 # We need for our local copies of the libssl3 headers to come | 711 # We need for our local copies of the libssl3 headers to come |
| 723 # before other includes, as we are shadowing system headers. | 712 # before other includes, as we are shadowing system headers. |
| 724 '<(DEPTH)/net/third_party/nss/ssl', | 713 '<(DEPTH)/net/third_party/nss/ssl', |
| 725 ], | 714 ], |
| 726 'cflags': [ | 715 'cflags': [ |
| 727 '<!@(<(pkg-config) --cflags nss)', | 716 '<!@(<(pkg-config) --cflags nss)', |
| 728 ], | 717 ], |
| 729 }, | 718 }, |
| 730 'link_settings': { | 719 'link_settings': { |
| 731 'ldflags': [ | 720 'ldflags': [ |
| 732 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', | 721 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', |
| 733 ], | 722 ], |
| 734 'libraries': [ | 723 'libraries': [ |
| 735 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', | 724 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', |
| 736 ], | 725 ], |
| 737 }, | 726 }, |
| 738 }], | 727 }], |
| 739 ['use_openssl==0 and use_system_ssl==1', { | |
| 740 'direct_dependent_settings': { | |
| 741 'cflags': [ | |
| 742 '<!@(<(pkg-config) --cflags nss)', | |
| 743 ], | |
| 744 'defines': [ | |
| 745 'USE_SYSTEM_SSL', | |
| 746 ], | |
| 747 }, | |
| 748 'link_settings': { | |
| 749 'ldflags': [ | |
| 750 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', | |
| 751 ], | |
| 752 'libraries': [ | |
| 753 '<!@(<(pkg-config) --libs-only-l nss)', | |
| 754 ], | |
| 755 }, | |
| 756 }], | |
| 757 ['use_openssl==0 and clang==1', { | 728 ['use_openssl==0 and clang==1', { |
| 758 'direct_dependent_settings': { | 729 'direct_dependent_settings': { |
| 759 'cflags': [ | 730 'cflags': [ |
| 760 # There is a broken header guard in /usr/include/nss/secmod.h: | 731 # There is a broken header guard in /usr/include/nss/secmod.h: |
| 761 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 | 732 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 |
| 762 '-Wno-header-guard', | 733 '-Wno-header-guard', |
| 763 ], | 734 ], |
| 764 }, | 735 }, |
| 765 }], | 736 }], |
| 766 ] | 737 ] |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 ], | 869 ], |
| 899 'libraries': [ | 870 'libraries': [ |
| 900 '<!@(pkg-config --libs-only-l xrandr)', | 871 '<!@(pkg-config --libs-only-l xrandr)', |
| 901 ], | 872 ], |
| 902 }, | 873 }, |
| 903 }], | 874 }], |
| 904 ], | 875 ], |
| 905 }, | 876 }, |
| 906 ], | 877 ], |
| 907 } | 878 } |
| OLD | NEW |