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 'includes': [ | 6 'includes': [ |
7 '../../build/win_precompile.gypi', | 7 '../../build/win_precompile.gypi', |
8 ], | 8 ], |
9 'variables': { | 9 'variables': { |
10 'variables': { | 10 'variables': { |
11 'conditions': [ | 11 'conditions': [ |
12 ['sysroot!=""', { | 12 ['sysroot!=""', { |
13 'pkg-config': '<(chroot_cmd) ../../build/linux/pkg-config-wrapper "<(s ysroot)" "<(target_arch)"', | 13 'pkg-config': '<(chroot_cmd) ../../build/linux/pkg-config-wrapper "<(s ysroot)" "<(target_arch)"', |
14 }, { | 14 }, { |
15 'pkg-config': 'pkg-config' | 15 'pkg-config': 'pkg-config' |
16 }], | 16 }], |
17 ], | 17 ], |
18 }, | 18 }, |
19 | 19 |
20 'pkg-config': '<(pkg-config)', | 20 'pkg-config': '<(pkg-config)', |
21 | 21 |
22 'conditions': [ | 22 'conditions': [ |
23 ['OS=="linux" and (buildtype!="Official" or chromeos==1)', { | 23 ['OS=="linux" and (buildtype!="Official" or chromeos==1)', { |
24 # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz | 24 # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz |
25 # anyways. However, we want to have control of the version of harfbuzz | 25 # anyways. However, we want to have control of the version of harfbuzz |
26 # we use, so don't use system harfbuzz for official builds, unless we | 26 # we use, so don't use system harfbuzz for official builds, unless we |
27 # are building for chrome os, where we have the system harfbuzz under | 27 # are building for chrome os, where we have the system harfbuzz under |
28 # control as well. | 28 # control as well. |
29 'use_system_harfbuzz': '<!(python ../../build/check_return_value.py <(pk g-config) --atleast-version=1.31.0 pangoft2)', | 29 'use_system_harfbuzz%': '<!(python ../../build/check_return_value.py <(p kg-config) --atleast-version=1.31.0 pangoft2)', |
30 }, { | 30 }, { |
31 'use_system_harfbuzz': 0, | 31 'use_system_harfbuzz': 0, |
Paweł Hajdan Jr.
2014/04/10 14:49:01
Consider also changing this one for consistency.
Mostyn Bramley-Moore
2014/04/10 15:00:49
I figure that you might want buildtype=="Official"
| |
32 }], | 32 }], |
33 ], | 33 ], |
34 }, | 34 }, |
35 'conditions': [ | 35 'conditions': [ |
36 ['use_system_harfbuzz==0', { | 36 ['use_system_harfbuzz==0', { |
37 'targets': [ | 37 'targets': [ |
38 { | 38 { |
39 'target_name': 'harfbuzz-ng', | 39 'target_name': 'harfbuzz-ng', |
40 'type': 'static_library', | 40 'type': 'static_library', |
41 'defines': [ | 41 'defines': [ |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
191 ], | 191 ], |
192 'libraries': [ | 192 'libraries': [ |
193 '<!@(<(pkg-config) --libs-only-l harfbuzz)', | 193 '<!@(<(pkg-config) --libs-only-l harfbuzz)', |
194 ], | 194 ], |
195 }, | 195 }, |
196 }, | 196 }, |
197 ], | 197 ], |
198 }], | 198 }], |
199 ], | 199 ], |
200 } | 200 } |
OLD | NEW |