Chromium Code Reviews| Index: pdfium.gyp |
| diff --git a/pdfium.gyp b/pdfium.gyp |
| index b0ce2e47645343e9bafe9185fe0dc604e6c44a37..96c3dcde52dbf80edbf970b56e73f4cbdb1b3abe 100644 |
| --- a/pdfium.gyp |
| +++ b/pdfium.gyp |
| @@ -1,6 +1,7 @@ |
| { |
| 'variables': { |
| 'pdf_use_skia%': 0, |
| + 'pdf_enable_xfa%': 1, |
| 'conditions': [ |
| ['OS=="linux"', { |
| 'bundle_freetype%': 0, |
| @@ -26,6 +27,9 @@ |
| ['pdf_use_skia==1', { |
| 'defines': ['_SKIA_SUPPORT_'], |
| }], |
| + ['pdf_enable_xfa==1', { |
| + 'defines': ['PDF_ENABLE_XFA'], |
| + }], |
| ['OS=="linux"', { |
| 'conditions': [ |
| ['target_arch=="x64"', { |
| @@ -675,9 +679,8 @@ |
| { |
| 'target_name': 'fpdfxfa', |
| 'type': 'static_library', |
| - 'ldflags': [ '-L<(PRODUCT_DIR)',], |
| 'dependencies': [ |
| - 'xfa.gyp:xfa', |
| + 'javascript' |
|
Tom Sepez
2015/10/12 18:09:22
note: needed to link when xfa not providing JS. W
|
| ], |
| 'sources': [ |
| 'fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp', |
| @@ -689,6 +692,14 @@ |
| 'fpdfsdk/include/fpdfxfa/fpdfxfa_page.h', |
| 'fpdfsdk/include/fpdfxfa/fpdfxfa_util.h', |
| ], |
| + 'ldflags': [ '-L<(PRODUCT_DIR)',], |
| + 'conditions': [ |
| + [ "pdf_enable_xfa==1", { |
| + 'dependencies': [ |
| + 'xfa.gyp:xfa', |
| + ], |
| + }], |
| + ], |
| }, |
| { |
| 'target_name': 'javascript', |
| @@ -818,8 +829,14 @@ |
| 'testing/fx_string_testhelpers.h', |
| 'testing/fx_string_testhelpers.cpp', |
| 'third_party/base/nonstd_unique_ptr_unittest.cpp', |
| - 'xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp', |
| - 'xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp', |
| + ], |
| + 'conditions': [ |
| + ['pdf_enable_xfa==1', { |
| + 'sources': [ |
| + 'xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp', |
| + 'xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp', |
| + ], |
| + }], |
| ], |
| }, |
| { |