diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-30 10:29:19 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-30 10:29:19 -0700 |
| commit | 22955d987b30056d787d5eeb1a8ac8a1277bf5e0 (patch) | |
| tree | b109acf2d1ba26d4676357e4952a4baabba2af26 /samples | |
| parent | 452bafebc358d9a1d57266b31a5869584c0fbfb7 (diff) | |
| download | pdfium-22955d987b30056d787d5eeb1a8ac8a1277bf5e0.tar.xz | |
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 .
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/BUILD.gn | 4 | ||||
| -rw-r--r-- | samples/samples.gyp | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/samples/BUILD.gn b/samples/BUILD.gn index 748a2af399..6f4518c17e 100644 --- a/samples/BUILD.gn +++ b/samples/BUILD.gn @@ -24,6 +24,10 @@ executable("pdfium_test") { ] deps = [ "//third_party/pdfium", + # Regardless of whether the library ships against system freetype, + # always link this binary against the bundled one for consistency + # of results across platforms. + "//third_party/pdfium/third_party:fx_freetype", "//v8:v8_libplatform", ":fx_lpng", ] diff --git a/samples/samples.gyp b/samples/samples.gyp index 4938ecb955..4b6c16bf2e 100644 --- a/samples/samples.gyp +++ b/samples/samples.gyp @@ -22,12 +22,21 @@ 'dependencies': [ 'fx_lpng', '../pdfium.gyp:pdfium', + # Regardless of whether the library ships against system freetype, + # always link this binary against the bundled one for consistency + # of results across platforms. + '../third_party/third_party.gyp:fx_freetype', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', ], 'sources': [ 'pdfium_test.cc', 'image_diff_png.cc', ], + 'link_settings': { + 'libraries!': [ + '-lfreetype', + ], + }, }, { 'target_name': 'pdfium_diff', |