diff options
-rw-r--r-- | .gn | 5 | ||||
-rw-r--r-- | core/fpdfapi/BUILD.gn | 10 | ||||
-rw-r--r-- | core/fpdfapi/edit/BUILD.gn | 5 | ||||
-rw-r--r-- | core/fpdfapi/font/BUILD.gn | 8 | ||||
-rw-r--r-- | core/fpdfapi/page/BUILD.gn | 15 | ||||
-rw-r--r-- | core/fpdfapi/parser/BUILD.gn | 7 | ||||
-rw-r--r-- | core/fpdfapi/render/BUILD.gn | 9 | ||||
-rw-r--r-- | core/fpdfdoc/BUILD.gn | 11 | ||||
-rw-r--r-- | core/fpdftext/BUILD.gn | 3 | ||||
-rw-r--r-- | core/fxcodec/BUILD.gn | 2 |
10 files changed, 71 insertions, 4 deletions
@@ -18,7 +18,7 @@ default_args = { check_targets = [ ":pdfium", - "//core/fxcrt/*", + "//core/*", "//fpdfsdk/*", "//fxbarcode/*", "//fxjs/*", @@ -27,7 +27,4 @@ check_targets = [ "//testing/fuzzers/*", "//testing/image_diff/*", "//xfa/*", - - # TODO(thestig): Work on these. - #"//core/*", ] diff --git a/core/fpdfapi/BUILD.gn b/core/fpdfapi/BUILD.gn index 347e66eec7..465b1afd0f 100644 --- a/core/fpdfapi/BUILD.gn +++ b/core/fpdfapi/BUILD.gn @@ -14,7 +14,10 @@ jumbo_source_set("fpdfapi") { ] configs += [ "../../:pdfium_core_config" ] deps = [ + "../fpdfdoc", + "../fxcodec", "../fxcrt", + "../fxge", "cmaps", "edit", "font", @@ -22,5 +25,12 @@ jumbo_source_set("fpdfapi") { "parser", "render", ] + allow_circular_includes_from = [ + "parser", + "cmaps", + "font", + "page", + "render", + ] visibility = [ "../../*" ] } diff --git a/core/fpdfapi/edit/BUILD.gn b/core/fpdfapi/edit/BUILD.gn index 1bcce79142..de1a404c87 100644 --- a/core/fpdfapi/edit/BUILD.gn +++ b/core/fpdfapi/edit/BUILD.gn @@ -22,7 +22,12 @@ jumbo_source_set("edit") { ] configs += [ "../../../:pdfium_core_config" ] deps = [ + "../../../third_party:skia_shared", "../../fxcrt", + "../font", + "../page", + "../parser", ] + allow_circular_includes_from = [ "../parser" ] visibility = [ "../../../*" ] } diff --git a/core/fpdfapi/font/BUILD.gn b/core/fpdfapi/font/BUILD.gn index e00bea75a5..a8f8619124 100644 --- a/core/fpdfapi/font/BUILD.gn +++ b/core/fpdfapi/font/BUILD.gn @@ -43,6 +43,14 @@ jumbo_source_set("font") { configs += [ "../../../:pdfium_core_config" ] deps = [ "../../fxcrt", + "../../fxge", + "../cmaps", + "../parser", + ] + allow_circular_includes_from = [ + "../../fxge", + "../cmaps", + "../parser", ] visibility = [ "../../../*" ] } diff --git a/core/fpdfapi/page/BUILD.gn b/core/fpdfapi/page/BUILD.gn index 573ee60fbf..5df39f2068 100644 --- a/core/fpdfapi/page/BUILD.gn +++ b/core/fpdfapi/page/BUILD.gn @@ -92,7 +92,22 @@ jumbo_source_set("page") { ] configs += [ "../../../:pdfium_core_config" ] deps = [ + "../../fdrm", + "../../fxcodec", "../../fxcrt", + "../../fxge", + "../cmaps", + "../font", + "../parser", ] + allow_circular_includes_from = [ + "../cmaps", + "../font", + "../parser", + "../../fxcodec", + ] + if (pdf_use_skia || pdf_use_skia_paths) { + allow_circular_includes_from += [ "../../fxge" ] + } visibility = [ "../../../*" ] } diff --git a/core/fpdfapi/parser/BUILD.gn b/core/fpdfapi/parser/BUILD.gn index 0a8958fa1b..64306dff1d 100644 --- a/core/fpdfapi/parser/BUILD.gn +++ b/core/fpdfapi/parser/BUILD.gn @@ -72,7 +72,14 @@ jumbo_source_set("parser") { ] configs += [ "../../../:pdfium_core_config" ] deps = [ + "../../fdrm", + "../../fxcodec", "../../fxcrt", + "../../fxge", + ] + allow_circular_includes_from = [ + "../../fxge", + "../../fxcodec", ] visibility = [ "../../../*" ] } diff --git a/core/fpdfapi/render/BUILD.gn b/core/fpdfapi/render/BUILD.gn index 02b3b4f5a6..042f04d179 100644 --- a/core/fpdfapi/render/BUILD.gn +++ b/core/fpdfapi/render/BUILD.gn @@ -48,7 +48,16 @@ jumbo_source_set("render") { ] configs += [ "../../../:pdfium_core_config" ] deps = [ + "../../fxcodec", "../../fxcrt", + "../../fxge", + "../font", + "../page", + "../parser", + ] + allow_circular_includes_from = [ + "../parser", + "../page", ] visibility = [ "../../../*" ] } diff --git a/core/fpdfdoc/BUILD.gn b/core/fpdfdoc/BUILD.gn index f7d9d71bd5..411d26a7cb 100644 --- a/core/fpdfdoc/BUILD.gn +++ b/core/fpdfdoc/BUILD.gn @@ -84,7 +84,18 @@ jumbo_source_set("fpdfdoc") { ] configs += [ "../../:pdfium_core_config" ] deps = [ + "../fpdfapi/font", + "../fpdfapi/page", + "../fpdfapi/parser", + "../fpdfapi/render", "../fxcrt", + "../fxge", + ] + allow_circular_includes_from = [ + "../fxge", + "../fpdfapi/parser", + "../fpdfapi/page", + "../fpdfapi/render", ] visibility = [ "../../*" ] } diff --git a/core/fpdftext/BUILD.gn b/core/fpdftext/BUILD.gn index f47745178e..1319c62c7d 100644 --- a/core/fpdftext/BUILD.gn +++ b/core/fpdftext/BUILD.gn @@ -18,6 +18,9 @@ jumbo_source_set("fpdftext") { ] configs += [ "../../:pdfium_core_config" ] deps = [ + "../fpdfapi/font", + "../fpdfapi/page", + "../fpdfapi/parser", "../fxcrt", ] visibility = [ "../../*" ] diff --git a/core/fxcodec/BUILD.gn b/core/fxcodec/BUILD.gn index 442a058ed0..4c06d5540f 100644 --- a/core/fxcodec/BUILD.gn +++ b/core/fxcodec/BUILD.gn @@ -73,8 +73,10 @@ jumbo_source_set("fxcodec") { "../../third_party:lcms2", "../../third_party:zlib", "../fxcrt", + "../fxge", "//third_party:jpeg", ] + allow_circular_includes_from = [ "../fxge" ] if (pdf_enable_xfa) { sources += [ |