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

Side by Side Diff: build/linux/system.gyp

Issue 301353009: Linux: Remove unused gcrypt gyp code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix build Created 6 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 | Annotate | Revision Log
« no previous file with comments | « build/linux/libgcrypt-config-wrapper ('k') | printing/printing.gyp » ('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) 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': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"', 9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"',
10 # libgcrypt-config-wrapper invokes libgcrypt-config directly from the
11 # sysroot, so there's no need to prefix it with <(chroot_cmd).
12 'libgcrypt-config': './libgcrypt-config-wrapper "<(sysroot)"',
13 }, { 10 }, {
14 'pkg-config': 'pkg-config', 11 'pkg-config': 'pkg-config',
15 'libgcrypt-config': 'libgcrypt-config',
16 }], 12 }],
17 ], 13 ],
18 14
19 'linux_link_libgps%': 0, 15 'linux_link_libgps%': 0,
20 'linux_link_libpci%': 0, 16 'linux_link_libpci%': 0,
21 'linux_link_libspeechd%': 0, 17 'linux_link_libspeechd%': 0,
22 'linux_link_libbrlapi%': 0, 18 'linux_link_libbrlapi%': 0,
23 }, 19 },
24 'conditions': [ 20 'conditions': [
25 [ 'chromeos==0 and use_ozone==0', { 21 [ 'chromeos==0 and use_ozone==0', {
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
786 { 782 {
787 'target_name': 'libcap', 783 'target_name': 'libcap',
788 'type': 'none', 784 'type': 'none',
789 'link_settings': { 785 'link_settings': {
790 'libraries': [ 786 'libraries': [
791 '-lcap', 787 '-lcap',
792 ], 788 ],
793 }, 789 },
794 }, 790 },
795 { 791 {
796 'target_name': 'libgcrypt',
797 'type': 'none',
798 'conditions': [
799 ['_toolset=="target" and use_cups==1', {
800 'direct_dependent_settings': {
801 'cflags': [
802 '<!@(<(libgcrypt-config) --cflags)',
803 ],
804 },
805 'link_settings': {
806 'libraries': [
807 # libgcrypt-config does not support --libs-only-l options,
808 # and the result contains -L options, which shouldn't be in
809 # the entries of 'libraries'. So filter them out.
810 '<!@(<(libgcrypt-config) --libs | sed -e \'s/-L[^ ]*//g\')',
811 ],
812 },
813 }],
814 ],
815 },
816 {
817 'target_name': 'libpci', 792 'target_name': 'libpci',
818 'type': 'static_library', 793 'type': 'static_library',
819 'cflags': [ 794 'cflags': [
820 '<!@(<(pkg-config) --cflags libpci)', 795 '<!@(<(pkg-config) --cflags libpci)',
821 ], 796 ],
822 'direct_dependent_settings': { 797 'direct_dependent_settings': {
823 'include_dirs': [ 798 'include_dirs': [
824 '<(SHARED_INTERMEDIATE_DIR)', 799 '<(SHARED_INTERMEDIATE_DIR)',
825 ], 800 ],
826 'conditions': [ 801 'conditions': [
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 ], 1040 ],
1066 'libraries': [ 1041 'libraries': [
1067 '<!@(<(pkg-config) --libs-only-l libudev)', 1042 '<!@(<(pkg-config) --libs-only-l libudev)',
1068 ], 1043 ],
1069 }, 1044 },
1070 }], 1045 }],
1071 ], 1046 ],
1072 }, 1047 },
1073 ], 1048 ],
1074 } 1049 }
OLDNEW
« no previous file with comments | « build/linux/libgcrypt-config-wrapper ('k') | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698