diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-08 14:36:16 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-08 14:36:16 -0800 |
| commit | d2e023bfe3c2ffe1e77bac464de7242f830b846f (patch) | |
| tree | 009279d033271fc853eb05ad5ada3d214d78c409 /samples | |
| parent | 4d6fa834ccc7fb8a7ada0db2235c866e20cd4b40 (diff) | |
| download | pdfium-d2e023bfe3c2ffe1e77bac464de7242f830b846f.tar.xz | |
Move default value of pdf_enable_xfa to standalone.gypi
This allows standalone pdfium builds to build with XFA, but
makes a chromium checkout revert to non-xfa even on this
branch. GN implies a chromium checkout at the moment, so
disable XFA there, too.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1508003003 .
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/BUILD.gn | 9 | ||||
| -rw-r--r-- | samples/samples.gyp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/samples/BUILD.gn b/samples/BUILD.gn index 6a9a516e25..e1192c4a43 100644 --- a/samples/BUILD.gn +++ b/samples/BUILD.gn @@ -31,8 +31,9 @@ config("pdfium_samples_config") { executable("pdfium_test") { testonly = true sources = [ - "image_diff_png.cc", "pdfium_test.cc", + "image_diff_png.cc", + "image_diff_png.h", ] deps = [ "//build/config/sanitizers:deps", @@ -44,6 +45,9 @@ executable("pdfium_test") { # of results across platforms. "//third_party/pdfium/third_party:fx_freetype", ] + if (!pdf_enable_xfa) { + deps += [ "../third_party:fx_lpng" ] + } if (pdf_enable_v8) { deps += [ "//v8:v8_libplatform" ] include_dirs = [ @@ -65,6 +69,9 @@ executable("pdfium_diff") { "//build/config/sanitizers:deps", "//third_party/pdfium", ] + if (!pdf_enable_xfa) { + deps += [ "../third_party:fx_lpng" ] + } configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":pdfium_samples_config", diff --git a/samples/samples.gyp b/samples/samples.gyp index 31fcbf7c72..da9ce74b0a 100644 --- a/samples/samples.gyp +++ b/samples/samples.gyp @@ -5,7 +5,7 @@ { 'variables': { 'pdf_enable_v8%': 1, - 'pdf_enable_xfa%': 1, + 'pdf_enable_xfa%': 0, # Set to 1 in standalone builds by standalone.gypi. }, 'target_defaults': { 'defines' : [ |