summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2015-02-03 09:14:41 -0800
committerJohn Abd-El-Malek <jam@chromium.org>2015-02-03 09:14:41 -0800
commita9e835e6356b40d27a524fa087805c65de442f03 (patch)
tree4abde06278475909d74700dbe30e08652ec3e657
parentef4dce44bb4b990f301a98853075f501c6f053d7 (diff)
downloadpdfium-a9e835e6356b40d27a524fa087805c65de442f03.tar.xz
Merge the following commit to XFA:
615082d Remove OpenJPEG header generator binary from PDFium build. by John Abd-El-Malek - 2 minutes ago master Review URL: https://codereview.chromium.org/875803004
-rw-r--r--BUILD.gn1
-rw-r--r--pdfium.gyp1
2 files changed, 0 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 761e1522e2..18f6a456ba 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -347,7 +347,6 @@ static_library("fxcodec") {
"core/src/fxcodec/fx_libopenjpeg/src/fx_pi.c",
"core/src/fxcodec/fx_libopenjpeg/src/fx_raw.c",
"core/src/fxcodec/fx_libopenjpeg/src/fx_t1.c",
- "core/src/fxcodec/fx_libopenjpeg/src/fx_t1_generate_luts.c",
"core/src/fxcodec/fx_libopenjpeg/src/fx_t2.c",
"core/src/fxcodec/fx_libopenjpeg/src/fx_tcd.c",
"core/src/fxcodec/fx_libopenjpeg/src/fx_tgt.c",
diff --git a/pdfium.gyp b/pdfium.gyp
index c9f54d7d2a..8861de5263 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -371,7 +371,6 @@
'core/src/fxcodec/fx_libopenjpeg/src/fx_pi.c',
'core/src/fxcodec/fx_libopenjpeg/src/fx_raw.c',
'core/src/fxcodec/fx_libopenjpeg/src/fx_t1.c',
- 'core/src/fxcodec/fx_libopenjpeg/src/fx_t1_generate_luts.c',
'core/src/fxcodec/fx_libopenjpeg/src/fx_t2.c',
'core/src/fxcodec/fx_libopenjpeg/src/fx_tcd.c',
'core/src/fxcodec/fx_libopenjpeg/src/fx_tgt.c',