From 7239fe9c9e52fa8f921a4acb9ea4a11bc58e64d7 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Mon, 15 Oct 2018 17:10:58 +0000
Subject: Make xfa/ pass gn check.

Use allow_circular_includes_from as a crutch for now.

Change-Id: I1aad3276a6fd571071270090235b0cfb625e337b
Reviewed-on: https://pdfium-review.googlesource.com/c/43986
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
---
 .gn                      |  2 +-
 xfa/fde/BUILD.gn         |  1 +
 xfa/fgas/BUILD.gn        |  5 +++++
 xfa/fwl/BUILD.gn         |  4 ++++
 xfa/fxfa/BUILD.gn        | 15 +++++++++++++++
 xfa/fxfa/fm2js/BUILD.gn  |  1 +
 xfa/fxfa/parser/BUILD.gn |  7 ++++++-
 xfa/fxgraphics/BUILD.gn  |  4 ++++
 8 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/.gn b/.gn
index e9335c5330..1d4f5fc276 100644
--- a/.gn
+++ b/.gn
@@ -23,10 +23,10 @@ check_targets = [
   "//testing/:*",
   "//testing/fuzzers/*",
   "//testing/image_diff/*",
+  "//xfa/*",
 
   # TODO(thestig): Work on these.
   #"//core/*",
   #"//fpdfsdk/*",
   #"//fxjs/*",
-  #"//xfa/*",
 ]
diff --git a/xfa/fde/BUILD.gn b/xfa/fde/BUILD.gn
index 6466f30848..3c600ec506 100644
--- a/xfa/fde/BUILD.gn
+++ b/xfa/fde/BUILD.gn
@@ -19,6 +19,7 @@ jumbo_source_set("fde") {
   ]
   deps = [
     "../../core/fxcrt",
+    "../../core/fxge",
   ]
   configs += [
     "../../:pdfium_core_config",
diff --git a/xfa/fgas/BUILD.gn b/xfa/fgas/BUILD.gn
index a6d2005135..c34aa0915c 100644
--- a/xfa/fgas/BUILD.gn
+++ b/xfa/fgas/BUILD.gn
@@ -35,8 +35,13 @@ jumbo_source_set("fgas") {
     "layout/cfx_txtbreak.h",
   ]
   deps = [
+    "../../core/fpdfapi/font",
+    "../../core/fpdfapi/parser",
     "../../core/fxcrt",
+    "../../core/fxge",
+    "../fde",
   ]
+  allow_circular_includes_from = [ "../fde" ]
   configs += [
     "../../:pdfium_core_config",
     "../:xfa_warnings",
diff --git a/xfa/fwl/BUILD.gn b/xfa/fwl/BUILD.gn
index 7277c320d9..bcccf8d7e4 100644
--- a/xfa/fwl/BUILD.gn
+++ b/xfa/fwl/BUILD.gn
@@ -122,8 +122,12 @@ jumbo_source_set("fwl") {
   ]
   deps = [
     "../../core/fxcrt",
+    "../../core/fxge",
     "../../fxbarcode",
+    "../fde",
     "../fgas",
+    "../fxfa/parser",
+    "../fxgraphics",
   ]
   configs += [
     "../../:pdfium_core_config",
diff --git a/xfa/fxfa/BUILD.gn b/xfa/fxfa/BUILD.gn
index 4c82ed3633..e87d772006 100644
--- a/xfa/fxfa/BUILD.gn
+++ b/xfa/fxfa/BUILD.gn
@@ -99,12 +99,27 @@ jumbo_source_set("fxfa") {
     "fxfa_basic.h",
   ]
   deps = [
+    "../../core/fpdfapi",
+    "../../core/fpdfapi/font",
+    "../../core/fpdfapi/parser",
+    "../../core/fpdfdoc",
+    "../../core/fxcodec",
     "../../core/fxcrt",
     "../../core/fxcrt:seekablemultistream",
     "../../core/fxcrt/css",
+    "../../core/fxge",
+    "../../fxbarcode",
     "../../fxjs",
     "../fde",
     "../fgas",
+    "../fwl",
+    "../fxgraphics",
+    "parser",
+  ]
+  allow_circular_includes_from = [
+    "../fgas",
+    "../fwl",
+    "parser",
   ]
   configs += [
     "../../:pdfium_core_config",
diff --git a/xfa/fxfa/fm2js/BUILD.gn b/xfa/fxfa/fm2js/BUILD.gn
index d34265f3a3..8da1ec5433 100644
--- a/xfa/fxfa/fm2js/BUILD.gn
+++ b/xfa/fxfa/fm2js/BUILD.gn
@@ -21,6 +21,7 @@ jumbo_source_set("fm2js") {
     "cxfa_fmtojavascriptdepth.h",
   ]
   deps = [
+    "../../../core/fxcrt",
     "//third_party/icu:icuuc",
   ]
   configs += [
diff --git a/xfa/fxfa/parser/BUILD.gn b/xfa/fxfa/parser/BUILD.gn
index 97b834a780..e65428e9e6 100644
--- a/xfa/fxfa/parser/BUILD.gn
+++ b/xfa/fxfa/parser/BUILD.gn
@@ -699,12 +699,17 @@ jumbo_source_set("parser") {
     "xfa_utils.h",
   ]
   deps = [
+    "../../../core/fpdfapi",
+    "../../../core/fxcodec",
     "../../../core/fxcrt",
+    "../../../core/fxge",
+    "../../../fxbarcode",
     "../../../fxjs",
     "../../fde",
     "../../fgas",
-    "../../fxfa",
+    "../../fxgraphics",
   ]
+  allow_circular_includes_from = [ "../../fgas" ]
   configs += [
     "../../../:pdfium_core_config",
     "../../:xfa_warnings",
diff --git a/xfa/fxgraphics/BUILD.gn b/xfa/fxgraphics/BUILD.gn
index 99087f69e5..438046cf20 100644
--- a/xfa/fxgraphics/BUILD.gn
+++ b/xfa/fxgraphics/BUILD.gn
@@ -24,5 +24,9 @@ jumbo_source_set("fxgraphics") {
     "../../:pdfium_core_config",
     "../:xfa_warnings",
   ]
+  deps = [
+    "../../core/fxcrt",
+    "../../core/fxge",
+  ]
   visibility = [ "../../*" ]
 }
-- 
cgit v1.2.3