From 0f05b1c9c19e9f45135bb3dd21044b2e69fe086a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 8 Dec 2015 16:19:37 -0800 Subject: XFA: Hide xfa targets in gyp (similar to GN) Allows "all" to include pdfium:* once again, since targets that don't exist except under xfa are hidden. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1502343007 . --- build/all.gyp | 4 +--- pdfium.gyp | 42 ++++++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/build/all.gyp b/build/all.gyp index 62db131617..7e2ea613ff 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -8,9 +8,7 @@ 'target_name': 'All', 'type': 'none', 'dependencies': [ - '../pdfium.gyp:pdfium', - '../pdfium.gyp:pdfium_embeddertests', - '../pdfium.gyp:pdfium_unittests', + '../pdfium.gyp:*', '../samples/samples.gyp:*', ], } diff --git a/pdfium.gyp b/pdfium.gyp index 82a170dbe2..934916fc3c 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -650,24 +650,6 @@ 'fpdfsdk/src/pdfwindow/PWL_Wnd.cpp', ], }, - { - 'target_name': 'fpdfxfa', - 'type': 'static_library', - 'dependencies': [ - 'javascript', - 'xfa.gyp:xfa', - ], - 'sources': [ - 'fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp', - 'fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp', - 'fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp', - 'fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp', - 'fpdfsdk/include/fpdfxfa/fpdfxfa_app.h', - 'fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h', - 'fpdfsdk/include/fpdfxfa/fpdfxfa_page.h', - 'fpdfsdk/include/fpdfxfa/fpdfxfa_util.h', - ], - }, { 'target_name': 'javascript', 'type': 'static_library', @@ -875,4 +857,28 @@ ], }, ], + 'conditions': [ + ['pdf_enable_xfa==1', { + 'targets': [ + { + 'target_name': 'fpdfxfa', + 'type': 'static_library', + 'dependencies': [ + 'javascript', + 'xfa.gyp:xfa', + ], + 'sources': [ + 'fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp', + 'fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp', + 'fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp', + 'fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp', + 'fpdfsdk/include/fpdfxfa/fpdfxfa_app.h', + 'fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h', + 'fpdfsdk/include/fpdfxfa/fpdfxfa_page.h', + 'fpdfsdk/include/fpdfxfa/fpdfxfa_util.h', + ], + }, + ] + }], + ] } -- cgit v1.2.3