| 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" and chromeos==0', { | 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. | 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 |
| 28 # control as well. |
| 27 '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 <(pk
g-config) --atleast-version=1.31.0 pangoft2)', |
| 28 }, { | 30 }, { |
| 29 'use_system_harfbuzz': 0, | 31 'use_system_harfbuzz': 0, |
| 30 }], | 32 }], |
| 31 ], | 33 ], |
| 32 }, | 34 }, |
| 33 'conditions': [ | 35 'conditions': [ |
| 34 ['use_system_harfbuzz==0', { | 36 ['use_system_harfbuzz==0', { |
| 35 'targets': [ | 37 'targets': [ |
| 36 { | 38 { |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 ], | 166 ], |
| 165 'sources': [ | 167 'sources': [ |
| 166 'src/hb-coretext.cc', | 168 'src/hb-coretext.cc', |
| 167 'src/hb-coretext.h', | 169 'src/hb-coretext.h', |
| 168 ], | 170 ], |
| 169 }], | 171 }], |
| 170 ], | 172 ], |
| 171 }, | 173 }, |
| 172 ], | 174 ], |
| 173 }, { # use_system_harfbuzz==1 | 175 }, { # use_system_harfbuzz==1 |
| 174 'variables': { | |
| 175 # Check for presence of harfbuzz-icu library, use it if present. | |
| 176 'harfbuzz_libraries': | |
| 177 '<!(python <(DEPTH)/tools/compile_test/compile_test.py ' | |
| 178 '--code "int main() { return 0; }" ' | |
| 179 '--run-linker ' | |
| 180 '--on-success "harfbuzz harfbuzz-icu" ' | |
| 181 '--on-failure "harfbuzz" ' | |
| 182 '-- -lharfbuzz-icu)', | |
| 183 }, | |
| 184 'targets': [ | 176 'targets': [ |
| 185 { | 177 { |
| 186 'target_name': 'harfbuzz-ng', | 178 'target_name': 'harfbuzz-ng', |
| 187 'type': 'none', | 179 'type': 'none', |
| 188 'cflags': [ | 180 'cflags': [ |
| 189 '<!@(<(pkg-config) --cflags <(harfbuzz_libraries))', | 181 '<!@(<(pkg-config) --cflags harfbuzz)', |
| 190 ], | 182 ], |
| 191 'direct_dependent_settings': { | 183 'direct_dependent_settings': { |
| 192 'cflags': [ | 184 'cflags': [ |
| 193 '<!@(<(pkg-config) --cflags <(harfbuzz_libraries))', | 185 '<!@(<(pkg-config) --cflags harfbuzz)', |
| 194 ], | 186 ], |
| 195 }, | 187 }, |
| 196 'link_settings': { | 188 'link_settings': { |
| 197 'ldflags': [ | 189 'ldflags': [ |
| 198 '<!@(<(pkg-config) --libs-only-L --libs-only-other <(harfbuzz_libr
aries))', | 190 '<!@(<(pkg-config) --libs-only-L --libs-only-other harfbuzz)', |
| 199 ], | 191 ], |
| 200 'libraries': [ | 192 'libraries': [ |
| 201 '<!@(<(pkg-config) --libs-only-l <(harfbuzz_libraries))', | 193 '<!@(<(pkg-config) --libs-only-l harfbuzz)', |
| 202 ], | 194 ], |
| 203 }, | 195 }, |
| 204 }, | 196 }, |
| 205 ], | 197 ], |
| 206 }], | 198 }], |
| 207 ], | 199 ], |
| 208 } | 200 } |
| OLD | NEW |