diff options
| -rw-r--r-- | .gn | 2 | ||||
| -rw-r--r-- | BUILD.gn | 14 | ||||
| -rw-r--r-- | fpdfsdk/BUILD.gn | 22 | ||||
| -rw-r--r-- | fpdfsdk/formfiller/BUILD.gn | 7 | ||||
| -rw-r--r-- | fpdfsdk/fpdfxfa/BUILD.gn | 7 | ||||
| -rw-r--r-- | fpdfsdk/pwl/BUILD.gn | 7 | ||||
| -rw-r--r-- | fxjs/BUILD.gn | 1 | ||||
| -rw-r--r-- | xfa/BUILD.gn | 13 |
8 files changed, 57 insertions, 16 deletions
@@ -18,6 +18,7 @@ default_args = { check_targets = [ "//core/fxcrt/*", + "//fpdfsdk/*", "//fxbarcode/*", "//samples/*", "//testing/:*", @@ -27,6 +28,5 @@ check_targets = [ # TODO(thestig): Work on these. #"//core/*", - #"//fpdfsdk/*", #"//fxjs/*", ] @@ -156,11 +156,25 @@ jumbo_static_library("pdfium") { "third_party:pdfium_base", "third_party:skia_shared", ] + allow_circular_includes_from = [ + "fpdfsdk", + "fpdfsdk/formfiller", + "fpdfsdk/pwl", + ] public_deps = [ "core/fxcrt", ] + if (pdf_enable_xfa) { + deps += [ + "fpdfsdk/fpdfxfa", + "xfa/fxfa", + "xfa/fxfa/parser", + ] + allow_circular_includes_from += [ "fpdfsdk/fpdfxfa" ] + } + if (is_win) { libs += [ "advapi32.lib", diff --git a/fpdfsdk/BUILD.gn b/fpdfsdk/BUILD.gn index f4df1d54cd..cf1fdbf85b 100644 --- a/fpdfsdk/BUILD.gn +++ b/fpdfsdk/BUILD.gn @@ -51,7 +51,20 @@ jumbo_source_set("fpdfsdk") { configs += [ "../:pdfium_core_config" ] deps = [ + "../core/fpdfapi", + "../core/fpdfapi/page", + "../core/fpdfapi/parser", + "../core/fpdfapi/render", + "../core/fpdfdoc", "../core/fxcrt", + "../core/fxge", + "../fxjs", + "formfiller", + "pwl", + ] + allow_circular_includes_from = [ + "formfiller", + "pwl", ] visibility = [ "../*" ] @@ -63,6 +76,13 @@ jumbo_source_set("fpdfsdk") { "cpdfsdk_xfawidgethandler.h", ] - deps += [ "fpdfxfa" ] + deps += [ + "../xfa/fwl", + "../xfa/fxfa", + "../xfa/fxfa/parser", + "../xfa/fxgraphics", + "fpdfxfa", + ] + allow_circular_includes_from += [ "fpdfxfa" ] } } diff --git a/fpdfsdk/formfiller/BUILD.gn b/fpdfsdk/formfiller/BUILD.gn index a9994ee1c1..434e58085e 100644 --- a/fpdfsdk/formfiller/BUILD.gn +++ b/fpdfsdk/formfiller/BUILD.gn @@ -32,7 +32,14 @@ jumbo_source_set("formfiller") { ] configs += [ "../../:pdfium_core_config" ] deps = [ + "../../core/fpdfapi/font", + "../../core/fpdfapi/page", + "../../core/fpdfapi/parser", + "../../core/fpdfdoc", "../../core/fxcrt", + "../../core/fxge", + "../pwl", ] + allow_circular_includes_from = [ "../pwl" ] visibility = [ "../../*" ] } diff --git a/fpdfsdk/fpdfxfa/BUILD.gn b/fpdfsdk/fpdfxfa/BUILD.gn index bca6f67884..baa615db46 100644 --- a/fpdfsdk/fpdfxfa/BUILD.gn +++ b/fpdfsdk/fpdfxfa/BUILD.gn @@ -19,9 +19,14 @@ jumbo_source_set("fpdfxfa") { "cxfa_fwladaptertimermgr.h", ] deps = [ + "../../core/fpdfapi/page", + "../../core/fpdfapi/parser", "../../core/fxcrt", "../../fxjs", - "../../xfa", + "../../xfa/fgas", + "../../xfa/fwl", + "../../xfa/fxfa", + "../../xfa/fxfa/parser", ] configs += [ "../../:pdfium_core_config" ] visibility = [ "../../*" ] diff --git a/fpdfsdk/pwl/BUILD.gn b/fpdfsdk/pwl/BUILD.gn index 7c33196788..c5e02685e8 100644 --- a/fpdfsdk/pwl/BUILD.gn +++ b/fpdfsdk/pwl/BUILD.gn @@ -42,7 +42,14 @@ jumbo_source_set("pwl") { ] configs += [ "../../:pdfium_core_config" ] deps = [ + "../../core/fpdfapi", + "../../core/fpdfapi/font", + "../../core/fpdfapi/page", + "../../core/fpdfapi/parser", + "../../core/fpdfapi/render", + "../../core/fpdfdoc", "../../core/fxcrt", + "../../core/fxge", ] visibility = [ "../../*" ] } diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn index 96c3c6df2f..a197d78f13 100644 --- a/fxjs/BUILD.gn +++ b/fxjs/BUILD.gn @@ -435,6 +435,7 @@ jumbo_source_set("fxjs") { "xfa/cjx_xsdconnection.cpp", "xfa/cjx_xsdconnection.h", ] + deps += [ "../xfa/fxfa/fm2js" ] } } } diff --git a/xfa/BUILD.gn b/xfa/BUILD.gn index 3453a40f78..df297373a9 100644 --- a/xfa/BUILD.gn +++ b/xfa/BUILD.gn @@ -12,16 +12,3 @@ config("xfa_warnings") { cflags = [ "-Wno-strict-overflow" ] } } - -group("xfa") { - deps = [ - "fde", - "fgas", - "fwl", - "fxfa", - "fxfa/fm2js", - "fxfa/parser", - "fxgraphics", - ] - visibility = [ "../*" ] -} |