diff options
| -rw-r--r-- | BUILD.gn | 55 | ||||
| -rw-r--r-- | fpdfsdk/BUILD.gn | 1 | ||||
| -rw-r--r-- | fpdfsdk/formfiller/BUILD.gn | 1 | ||||
| -rw-r--r-- | fpdfsdk/fpdfxfa/BUILD.gn | 1 | ||||
| -rw-r--r-- | fpdfsdk/pwl/BUILD.gn | 1 |
5 files changed, 32 insertions, 27 deletions
@@ -91,6 +91,32 @@ config("pdfium_core_config") { configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } +jumbo_source_set("pdfium_public_headers") { + sources = [ + "public/cpp/fpdf_deleters.h", + "public/cpp/fpdf_scopers.h", + "public/fpdf_annot.h", + "public/fpdf_attachment.h", + "public/fpdf_catalog.h", + "public/fpdf_dataavail.h", + "public/fpdf_doc.h", + "public/fpdf_edit.h", + "public/fpdf_ext.h", + "public/fpdf_flatten.h", + "public/fpdf_formfill.h", + "public/fpdf_fwlevent.h", + "public/fpdf_ppo.h", + "public/fpdf_progressive.h", + "public/fpdf_save.h", + "public/fpdf_searchex.h", + "public/fpdf_structtree.h", + "public/fpdf_sysfontinfo.h", + "public/fpdf_text.h", + "public/fpdf_transformpage.h", + "public/fpdfview.h", + ] +} + jumbo_static_library("pdfium") { sources = [ "fpdfsdk/fpdf_annot.cpp", @@ -114,33 +140,13 @@ jumbo_static_library("pdfium") { "fpdfsdk/fpdf_text.cpp", "fpdfsdk/fpdf_transformpage.cpp", "fpdfsdk/fpdf_view.cpp", - "public/cpp/fpdf_deleters.h", - "public/cpp/fpdf_scopers.h", - "public/fpdf_annot.h", - "public/fpdf_attachment.h", - "public/fpdf_catalog.h", - "public/fpdf_dataavail.h", - "public/fpdf_doc.h", - "public/fpdf_edit.h", - "public/fpdf_ext.h", - "public/fpdf_flatten.h", - "public/fpdf_formfill.h", - "public/fpdf_fwlevent.h", - "public/fpdf_ppo.h", - "public/fpdf_progressive.h", - "public/fpdf_save.h", - "public/fpdf_searchex.h", - "public/fpdf_structtree.h", - "public/fpdf_sysfontinfo.h", - "public/fpdf_text.h", - "public/fpdf_transformpage.h", - "public/fpdfview.h", ] libs = [] configs += [ ":pdfium_core_config" ] deps = [ + ":pdfium_public_headers", "constants", "core/fdrm", "core/fpdfapi", @@ -161,13 +167,9 @@ jumbo_static_library("pdfium") { "third_party:pdfium_base", "third_party:skia_shared", ] - allow_circular_includes_from = [ - "fpdfsdk", - "fpdfsdk/formfiller", - "fpdfsdk/pwl", - ] public_deps = [ + ":pdfium_public_headers", "core/fxcrt", ] @@ -178,7 +180,6 @@ jumbo_static_library("pdfium") { "xfa/fxfa", "xfa/fxfa/parser", ] - allow_circular_includes_from += [ "fpdfsdk/fpdfxfa" ] } if (is_win) { diff --git a/fpdfsdk/BUILD.gn b/fpdfsdk/BUILD.gn index 0a696d3b71..bf80636d6d 100644 --- a/fpdfsdk/BUILD.gn +++ b/fpdfsdk/BUILD.gn @@ -51,6 +51,7 @@ jumbo_source_set("fpdfsdk") { configs += [ "../:pdfium_core_config" ] deps = [ + "../:pdfium_public_headers", "../core/fpdfapi", "../core/fpdfapi/page", "../core/fpdfapi/parser", diff --git a/fpdfsdk/formfiller/BUILD.gn b/fpdfsdk/formfiller/BUILD.gn index 434e58085e..a16ee512ec 100644 --- a/fpdfsdk/formfiller/BUILD.gn +++ b/fpdfsdk/formfiller/BUILD.gn @@ -32,6 +32,7 @@ jumbo_source_set("formfiller") { ] configs += [ "../../:pdfium_core_config" ] deps = [ + "../../:pdfium_public_headers", "../../core/fpdfapi/font", "../../core/fpdfapi/page", "../../core/fpdfapi/parser", diff --git a/fpdfsdk/fpdfxfa/BUILD.gn b/fpdfsdk/fpdfxfa/BUILD.gn index a1c6170826..d59c23783b 100644 --- a/fpdfsdk/fpdfxfa/BUILD.gn +++ b/fpdfsdk/fpdfxfa/BUILD.gn @@ -19,6 +19,7 @@ jumbo_source_set("fpdfxfa") { "cxfa_fwladaptertimermgr.h", ] deps = [ + "../../:pdfium_public_headers", "../../core/fpdfapi/page", "../../core/fpdfapi/parser", "../../core/fxcrt", diff --git a/fpdfsdk/pwl/BUILD.gn b/fpdfsdk/pwl/BUILD.gn index c5e02685e8..c600647452 100644 --- a/fpdfsdk/pwl/BUILD.gn +++ b/fpdfsdk/pwl/BUILD.gn @@ -42,6 +42,7 @@ jumbo_source_set("pwl") { ] configs += [ "../../:pdfium_core_config" ] deps = [ + "../../:pdfium_public_headers", "../../core/fpdfapi", "../../core/fpdfapi/font", "../../core/fpdfapi/page", |