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

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

Issue 831453004: Do not depend on or try to configure pangocairo when use_pango == 0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('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 }, { 10 }, {
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 '--link-directly=<(linux_link_libpci)', 651 '--link-directly=<(linux_link_libpci)',
652 '<@(libpci_functions)', 652 '<@(libpci_functions)',
653 ], 653 ],
654 'message': 'Generating libpci library loader', 654 'message': 'Generating libpci library loader',
655 'process_outputs_as_sources': 1, 655 'process_outputs_as_sources': 1,
656 }, 656 },
657 ], 657 ],
658 }, 658 },
659 ], 659 ],
660 }], 660 }],
661 ['use_pango==1 and use_cairo==1', {
662 'targets': [
663 {
664 'target_name': 'pangocairo',
665 'type': 'none',
Nico 2015/01/13 22:55:50 Please keep the target available unconditionally,
sfunkenhauser-google 2015/01/14 17:13:58 Done.
666 'toolsets': ['host', 'target'],
667 'conditions': [
668 ['_toolset=="target"', {
669 'direct_dependent_settings': {
670 'cflags': [
671 '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
672 ],
673 },
674 'link_settings': {
675 'ldflags': [
676 '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)',
677 ],
678 'libraries': [
679 '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
680 ],
681 },
682 }, {
683 'direct_dependent_settings': {
684 'cflags': [
685 '<!@(pkg-config --cflags pangocairo pangoft2)',
686 ],
687 },
688 'link_settings': {
689 'ldflags': [
690 '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pan goft2)',
691 ],
692 'libraries': [
693 '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
694 ],
695 },
696 }],
697 ],
698 },
699 ],
700 }],
661 ], # conditions 701 ], # conditions
662 'targets': [ 702 'targets': [
663 { 703 {
664 'target_name': 'dbus', 704 'target_name': 'dbus',
665 'type': 'none', 705 'type': 'none',
666 'direct_dependent_settings': { 706 'direct_dependent_settings': {
667 'cflags': [ 707 'cflags': [
668 '<!@(<(pkg-config) --cflags dbus-1)', 708 '<!@(<(pkg-config) --cflags dbus-1)',
669 ], 709 ],
670 }, 710 },
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 'spd_set_synthesis_voice', 1139 'spd_set_synthesis_voice',
1100 'spd_list_modules', 1140 'spd_list_modules',
1101 'spd_set_output_module', 1141 'spd_set_output_module',
1102 ], 1142 ],
1103 'message': 'Generating libspeechd library loader', 1143 'message': 'Generating libspeechd library loader',
1104 'process_outputs_as_sources': 1, 1144 'process_outputs_as_sources': 1,
1105 }, 1145 },
1106 ], 1146 ],
1107 }, 1147 },
1108 { 1148 {
1109 'target_name': 'pangocairo',
1110 'type': 'none',
1111 'toolsets': ['host', 'target'],
1112 'conditions': [
1113 ['_toolset=="target"', {
1114 'direct_dependent_settings': {
1115 'cflags': [
1116 '<!@(<(pkg-config) --cflags pangocairo pangoft2)',
1117 ],
1118 },
1119 'link_settings': {
1120 'ldflags': [
1121 '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pang oft2)',
1122 ],
1123 'libraries': [
1124 '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)',
1125 ],
1126 },
1127 }, {
1128 'direct_dependent_settings': {
1129 'cflags': [
1130 '<!@(pkg-config --cflags pangocairo pangoft2)',
1131 ],
1132 },
1133 'link_settings': {
1134 'ldflags': [
1135 '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft 2)',
1136 ],
1137 'libraries': [
1138 '<!@(pkg-config --libs-only-l pangocairo pangoft2)',
1139 ],
1140 },
1141 }],
1142 ],
1143 },
1144 {
1145 'target_name': 'ssl', 1149 'target_name': 'ssl',
1146 'type': 'none', 1150 'type': 'none',
1147 'conditions': [ 1151 'conditions': [
1148 ['_toolset=="target"', { 1152 ['_toolset=="target"', {
1149 'conditions': [ 1153 'conditions': [
1150 ['use_openssl==1', { 1154 ['use_openssl==1', {
1151 'dependencies': [ 1155 'dependencies': [
1152 '../../third_party/boringssl/boringssl.gyp:boringssl', 1156 '../../third_party/boringssl/boringssl.gyp:boringssl',
1153 ], 1157 ],
1154 }], 1158 }],
(...skipping 28 matching lines...) Expand all
1183 '-Wno-header-guard', 1187 '-Wno-header-guard',
1184 ], 1188 ],
1185 }, 1189 },
1186 }], 1190 }],
1187 ] 1191 ]
1188 }], 1192 }],
1189 ], 1193 ],
1190 }, 1194 },
1191 ], 1195 ],
1192 } 1196 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698