From 22955d987b30056d787d5eeb1a8ac8a1277bf5e0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 30 Jul 2015 10:29:19 -0700 Subject: Use bundled freetype for the pdfium_test binary. But use platform freetype for library itself according to the rules for the platform. This should greatly reduce per-platform diffs in the corpus tests, but requires that the corpus be rolled at the same time. When this rolls into chromium, its src/BUILD.gn will need to be updated to say third_party:fx_freetype instead of third_party:freetype. R=jam@chromium.org Review URL: https://codereview.chromium.org/1267493005 . --- third_party/BUILD.gn | 6 ++++-- third_party/third_party.gyp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'third_party') diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 37e30ce06d..b1c8e262fc 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,9 @@ source_set("bigint") { ] } -source_set("freetype") { +# Tests may link against this even if the production library doesn't, +# so it needs to be separate from it. +static_library("fx_freetype") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code", diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 79368b5a68..4403f3cdac 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -30,7 +30,7 @@ ], }, { - 'target_name': 'freetype', + 'target_name': 'fx_freetype', 'type': 'static_library', 'defines': [ 'FT2_BUILD_LIBRARY', -- cgit v1.2.3