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

Unified Diff: third_party/harfbuzz-ng/BUILD.gn

Issue 1287853007: Rename is_chromeos in harfbuzz. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/harfbuzz-ng/BUILD.gn
diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
index 144130af1cab79d01df6bdfda2770fd898cc1c4a..2a35993a2016e5e3c2da31cef7df207854f82d5d 100644
--- a/third_party/harfbuzz-ng/BUILD.gn
+++ b/third_party/harfbuzz-ng/BUILD.gn
@@ -20,12 +20,12 @@ declare_args() {
# we use, so don't use system harfbuzz unless we are building for
# chrome os, where we have the system harfbuzz under control.
use_system_harfbuzz =
- is_linux && is_chromeos && exec_script(pkg_config_script,
- pkg_config_args + [
- "--atleast-version=1.31.0",
- "pangoft2",
- ],
- "value")
+ is_chromeos_ui && exec_script(pkg_config_script,
+ pkg_config_args + [
+ "--atleast-version=1.31.0",
+ "pangoft2",
+ ],
+ "value")
}
if (use_system_harfbuzz) {
@@ -184,7 +184,7 @@ if (use_system_harfbuzz) {
# in the tree, all symbols pango needs must be included, or
# pango uses mixed versions of harfbuzz and leads to crash.
# See crbug.com/462689.
- if (is_linux && use_pango && !is_chromeos && !is_official_build &&
+ if (is_linux && !is_chromeos_ui && use_pango && !is_official_build &&
current_cpu != "arm" && current_cpu != "mipsel") {
configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
configs += [
@@ -201,7 +201,7 @@ if (use_system_harfbuzz) {
# See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this.
config("pangoft2_link_hack") {
- if (is_linux && use_pango && !is_chromeos && !is_official_build &&
+ if (is_linux && !is_chromeos_ui && use_pango && !is_official_build &&
current_cpu != "arm" && current_cpu != "mipsel" &&
!is_component_build) {
# These symbols are referenced from libpangoft2, which will be
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698