| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/linux/pkg_config.gni") | 5 import("//build/config/linux/pkg_config.gni") | 
| 6 | 6 | 
| 7 # The GYP build supports system harfbuzz for non-official builds when using | 7 # The GYP build supports system harfbuzz for non-official builds when using | 
| 8 # pangoft2 1.31.0 or greater (which pulls it in). | 8 # pangoft2 1.31.0 or greater (which pulls it in). | 
| 9 # TODO(brettw) we can consider doing this as well, although the benefit is | 9 # TODO(brettw) we can consider doing this as well, although the benefit is | 
| 10 # unclear and requires shelling out to a script to check the version. | 10 # unclear and requires shelling out to a script to check the version. | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 21     # control as well. | 21     # control as well. | 
| 22     use_system_harfbuzz = exec_script(pkg_config_script, | 22     use_system_harfbuzz = exec_script(pkg_config_script, | 
| 23                                       pkg_config_args + [ | 23                                       pkg_config_args + [ | 
| 24                                             "--atleast-version=1.31.0", | 24                                             "--atleast-version=1.31.0", | 
| 25                                             "pangoft2", | 25                                             "pangoft2", | 
| 26                                           ], | 26                                           ], | 
| 27                                       "value") | 27                                       "value") | 
| 28   } else { | 28   } else { | 
| 29     use_system_harfbuzz = false | 29     use_system_harfbuzz = false | 
| 30   } | 30   } | 
| 31   if (is_linux && cpu_arch == "arm" && !is_chromeos) { | 31   if (is_linux && current_cpu == "arm" && !is_chromeos) { | 
| 32     # Override use_system_harfbuzz for ARM cross compiling so system | 32     # Override use_system_harfbuzz for ARM cross compiling so system | 
| 33     # harfbuzz is not used because the corresponding package is not | 33     # harfbuzz is not used because the corresponding package is not | 
| 34     # available. | 34     # available. | 
| 35     use_system_harfbuzz = false | 35     use_system_harfbuzz = false | 
| 36   } | 36   } | 
| 37 } | 37 } | 
| 38 | 38 | 
| 39 if (use_system_harfbuzz) { | 39 if (use_system_harfbuzz) { | 
| 40   import("//build/config/linux/pkg_config.gni") | 40   import("//build/config/linux/pkg_config.gni") | 
| 41   pkg_config("harfbuzz_pkgconfig") { | 41   pkg_config("harfbuzz_pkgconfig") { | 
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 154 | 154 | 
| 155     deps = [ | 155     deps = [ | 
| 156       "//third_party/icu:icuuc", | 156       "//third_party/icu:icuuc", | 
| 157     ] | 157     ] | 
| 158 | 158 | 
| 159     cflags = [] | 159     cflags = [] | 
| 160     if (is_clang) { | 160     if (is_clang) { | 
| 161       cflags += [ "-Wno-unused-value" ] | 161       cflags += [ "-Wno-unused-value" ] | 
| 162     } | 162     } | 
| 163     if (is_win) { | 163     if (is_win) { | 
| 164       cflags += [ | 164       cflags += [ "/wd4334" ]  # Result of 32-bit shift implicitly converted to 
     64 bits. | 
| 165         "/wd4334",  # Result of 32-bit shift implicitly converted to 64 bits. |  | 
| 166       ] |  | 
| 167     } | 165     } | 
| 168     if (is_mac) { | 166     if (is_mac) { | 
| 169       sources += [ | 167       sources += [ | 
| 170         "src/hb-coretext.cc", | 168         "src/hb-coretext.cc", | 
| 171         "src/hb-coretext.h", | 169         "src/hb-coretext.h", | 
| 172       ] | 170       ] | 
| 173       defines += [ "HAVE_CORETEXT" ] | 171       defines += [ "HAVE_CORETEXT" ] | 
| 174     } | 172     } | 
| 175   } | 173   } | 
| 176 } | 174 } | 
| OLD | NEW | 
|---|