From 0dfd03060be722485f44446f18e2e4eaf9344595 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 12 Oct 2015 15:38:22 -0700 Subject: Fix XFA GN build R=thestig@chromium.org Review URL: https://codereview.chromium.org/1401253002 . --- BUILD.gn | 6 +++--- third_party/BUILD.gn | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index cf07c33d8d..23e9f9a8ff 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -9,7 +9,7 @@ pdf_use_skia = false declare_args() { # On Android there's no system FreeType. On Windows and Mac, only a few # methods are used from it. - bundle_freetype = !is_linux + pdfium_bundle_freetype = !is_linux } config("pdfium_config") { @@ -125,8 +125,8 @@ static_library("pdfium") { libs += [ "AppKit.framework", "CoreFoundation.framework" ] } - if (bundle_freetype) { - deps += [ "third_party:freetype" ] + if (pdfium_bundle_freetype) { + deps += [ "third_party:fx_freetype" ] } else { libs += [ "freetype" ] } diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 27b602379f..a6c9520aba 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -5,7 +5,7 @@ group("third_party") { deps = [ ":bigint", - ":freetype", + ":fx_freetype", ":pdfium_base", ] } @@ -30,7 +30,7 @@ static_library("bigint") { ] } -source_set("freetype") { +source_set("fx_freetype") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code", -- cgit v1.2.3