Split core/fxcrt build rules into core/fxcrt/BUILD.gn.

Change-Id: I9b3608bd76ec4911a4bb820fcda62c5d9533fb4f
Reviewed-on: https://pdfium-review.googlesource.com/c/43947
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

20 files changed, 189 insertions, 182 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 1df610065b..9882e72a2c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -141,13 +141,13 @@ jumbo_static_library("pdfium") {
   configs += [ ":pdfium_core_config" ]
 
   deps = [
-    ":fxcrt",
     "constants",
     "core/fdrm",
     "core/fpdfapi",
     "core/fpdfdoc",
     "core/fpdftext",
     "core/fxcodec",
+    "core/fxcrt",
     "core/fxge",
     "fpdfsdk",
     "fpdfsdk/formfiller",
@@ -158,7 +158,7 @@ jumbo_static_library("pdfium") {
   ]
 
   public_deps = [
-    ":fxcrt",
+    "core/fxcrt",
   ]
 
   if (is_win) {
@@ -189,168 +189,6 @@ visibility = [
   "//:gn_visibility",
 ]
 
-jumbo_source_set("fxcrt") {
-  sources = [
-    "core/fxcrt/autorestorer.h",
-    "core/fxcrt/bytestring.cpp",
-    "core/fxcrt/bytestring.h",
-    "core/fxcrt/cfx_binarybuf.cpp",
-    "core/fxcrt/cfx_binarybuf.h",
-    "core/fxcrt/cfx_bitstream.cpp",
-    "core/fxcrt/cfx_bitstream.h",
-    "core/fxcrt/cfx_datetime.cpp",
-    "core/fxcrt/cfx_datetime.h",
-    "core/fxcrt/cfx_fixedbufgrow.h",
-    "core/fxcrt/cfx_memorystream.cpp",
-    "core/fxcrt/cfx_memorystream.h",
-    "core/fxcrt/cfx_readonlymemorystream.cpp",
-    "core/fxcrt/cfx_readonlymemorystream.h",
-    "core/fxcrt/cfx_seekablemultistream.cpp",
-    "core/fxcrt/cfx_seekablemultistream.h",
-    "core/fxcrt/cfx_seekablestreamproxy.cpp",
-    "core/fxcrt/cfx_seekablestreamproxy.h",
-    "core/fxcrt/cfx_utf8decoder.cpp",
-    "core/fxcrt/cfx_utf8decoder.h",
-    "core/fxcrt/cfx_utf8encoder.cpp",
-    "core/fxcrt/cfx_utf8encoder.h",
-    "core/fxcrt/cfx_widetextbuf.cpp",
-    "core/fxcrt/cfx_widetextbuf.h",
-    "core/fxcrt/fileaccess_iface.h",
-    "core/fxcrt/fx_bidi.cpp",
-    "core/fxcrt/fx_bidi.h",
-    "core/fxcrt/fx_codepage.cpp",
-    "core/fxcrt/fx_codepage.h",
-    "core/fxcrt/fx_coordinates.cpp",
-    "core/fxcrt/fx_coordinates.h",
-    "core/fxcrt/fx_extension.cpp",
-    "core/fxcrt/fx_extension.h",
-    "core/fxcrt/fx_memory.cpp",
-    "core/fxcrt/fx_memory.h",
-    "core/fxcrt/fx_number.cpp",
-    "core/fxcrt/fx_number.h",
-    "core/fxcrt/fx_random.cpp",
-    "core/fxcrt/fx_random.h",
-    "core/fxcrt/fx_safe_types.h",
-    "core/fxcrt/fx_stream.cpp",
-    "core/fxcrt/fx_stream.h",
-    "core/fxcrt/fx_string.cpp",
-    "core/fxcrt/fx_string.h",
-    "core/fxcrt/fx_system.cpp",
-    "core/fxcrt/fx_system.h",
-    "core/fxcrt/fx_ucddata.cpp",
-    "core/fxcrt/fx_ucddata.h",
-    "core/fxcrt/fx_unicode.cpp",
-    "core/fxcrt/fx_unicode.h",
-    "core/fxcrt/maybe_owned.h",
-    "core/fxcrt/observable.h",
-    "core/fxcrt/pauseindicator_iface.h",
-    "core/fxcrt/retain_ptr.h",
-    "core/fxcrt/shared_copy_on_write.h",
-    "core/fxcrt/string_data_template.h",
-    "core/fxcrt/string_pool_template.h",
-    "core/fxcrt/string_view_template.h",
-    "core/fxcrt/unowned_ptr.h",
-    "core/fxcrt/weak_ptr.h",
-    "core/fxcrt/widestring.cpp",
-    "core/fxcrt/widestring.h",
-    "core/fxcrt/xml/cfx_xmlchardata.cpp",
-    "core/fxcrt/xml/cfx_xmlchardata.h",
-    "core/fxcrt/xml/cfx_xmldocument.cpp",
-    "core/fxcrt/xml/cfx_xmldocument.h",
-    "core/fxcrt/xml/cfx_xmlelement.cpp",
-    "core/fxcrt/xml/cfx_xmlelement.h",
-    "core/fxcrt/xml/cfx_xmlinstruction.cpp",
-    "core/fxcrt/xml/cfx_xmlinstruction.h",
-    "core/fxcrt/xml/cfx_xmlnode.cpp",
-    "core/fxcrt/xml/cfx_xmlnode.h",
-    "core/fxcrt/xml/cfx_xmlparser.cpp",
-    "core/fxcrt/xml/cfx_xmlparser.h",
-    "core/fxcrt/xml/cfx_xmltext.cpp",
-    "core/fxcrt/xml/cfx_xmltext.h",
-  ]
-  configs += [ ":pdfium_core_config" ]
-  visibility += [
-    "core/*",
-    "fxbarcode:*",
-    "fpdfsdk/*",
-    "fxjs:*",
-    "xfa/*",
-    "third_party:*",
-  ]
-  deps = [
-    "third_party:pdfium_base",
-  ]
-  public_deps = [
-    ":freetype_common",
-    "third_party:pdfium_base",
-    "//third_party/icu:icuuc",
-  ]
-  if (is_posix || is_fuchsia) {
-    sources += [
-      "core/fxcrt/cfx_fileaccess_posix.cpp",
-      "core/fxcrt/cfx_fileaccess_posix.h",
-    ]
-  }
-  if (is_win) {
-    sources += [
-      "core/fxcrt/cfx_fileaccess_windows.cpp",
-      "core/fxcrt/cfx_fileaccess_windows.h",
-    ]
-  }
-  if (pdf_enable_xfa) {
-    sources += [
-      "core/fxcrt/cfx_char.cpp",
-      "core/fxcrt/cfx_char.h",
-      "core/fxcrt/cfx_decimal.cpp",
-      "core/fxcrt/cfx_decimal.h",
-      "core/fxcrt/css/cfx_css.h",
-      "core/fxcrt/css/cfx_csscolorvalue.cpp",
-      "core/fxcrt/css/cfx_csscolorvalue.h",
-      "core/fxcrt/css/cfx_csscomputedstyle.cpp",
-      "core/fxcrt/css/cfx_csscomputedstyle.h",
-      "core/fxcrt/css/cfx_csscustomproperty.cpp",
-      "core/fxcrt/css/cfx_csscustomproperty.h",
-      "core/fxcrt/css/cfx_cssdata.cpp",
-      "core/fxcrt/css/cfx_cssdata.h",
-      "core/fxcrt/css/cfx_cssdeclaration.cpp",
-      "core/fxcrt/css/cfx_cssdeclaration.h",
-      "core/fxcrt/css/cfx_cssenumvalue.cpp",
-      "core/fxcrt/css/cfx_cssenumvalue.h",
-      "core/fxcrt/css/cfx_cssexttextbuf.cpp",
-      "core/fxcrt/css/cfx_cssexttextbuf.h",
-      "core/fxcrt/css/cfx_cssnumbervalue.cpp",
-      "core/fxcrt/css/cfx_cssnumbervalue.h",
-      "core/fxcrt/css/cfx_csspropertyholder.cpp",
-      "core/fxcrt/css/cfx_csspropertyholder.h",
-      "core/fxcrt/css/cfx_cssrulecollection.cpp",
-      "core/fxcrt/css/cfx_cssrulecollection.h",
-      "core/fxcrt/css/cfx_cssselector.cpp",
-      "core/fxcrt/css/cfx_cssselector.h",
-      "core/fxcrt/css/cfx_cssstringvalue.cpp",
-      "core/fxcrt/css/cfx_cssstringvalue.h",
-      "core/fxcrt/css/cfx_cssstylerule.cpp",
-      "core/fxcrt/css/cfx_cssstylerule.h",
-      "core/fxcrt/css/cfx_cssstyleselector.cpp",
-      "core/fxcrt/css/cfx_cssstyleselector.h",
-      "core/fxcrt/css/cfx_cssstylesheet.cpp",
-      "core/fxcrt/css/cfx_cssstylesheet.h",
-      "core/fxcrt/css/cfx_csssyntaxparser.cpp",
-      "core/fxcrt/css/cfx_csssyntaxparser.h",
-      "core/fxcrt/css/cfx_csstextbuf.cpp",
-      "core/fxcrt/css/cfx_csstextbuf.h",
-      "core/fxcrt/css/cfx_cssvalue.cpp",
-      "core/fxcrt/css/cfx_cssvalue.h",
-      "core/fxcrt/css/cfx_cssvaluelist.cpp",
-      "core/fxcrt/css/cfx_cssvaluelist.h",
-      "core/fxcrt/css/cfx_cssvaluelistparser.cpp",
-      "core/fxcrt/css/cfx_cssvaluelistparser.h",
-      "core/fxcrt/fx_arabic.cpp",
-      "core/fxcrt/fx_arabic.h",
-      "core/fxcrt/locale_iface.h",
-    ]
-  }
-}
-
 test("pdfium_unittests") {
   testonly = true
   sources = [
diff --git a/core/fdrm/BUILD.gn b/core/fdrm/BUILD.gn
index d030f01d2d..7a083ffd63 100644
--- a/core/fdrm/BUILD.gn
+++ b/core/fdrm/BUILD.gn
@@ -14,7 +14,7 @@ jumbo_source_set("fdrm") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
-    "../../:fxcrt",
+    "../fxcrt",
   ]
   visibility = [ "../../*" ]
 }
diff --git a/core/fpdfapi/BUILD.gn b/core/fpdfapi/BUILD.gn
index 489df0b11e..a5b86a503e 100644
--- a/core/fpdfapi/BUILD.gn
+++ b/core/fpdfapi/BUILD.gn
@@ -303,8 +303,8 @@ jumbo_source_set("fpdfapi") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
-    "../../:fxcrt",
     "../../third_party:lcms2",
+    "../fxcrt",
   ]
   visibility = [ "../../*" ]
 }
diff --git a/core/fpdfdoc/BUILD.gn b/core/fpdfdoc/BUILD.gn
index e76486dee3..f7d9d71bd5 100644
--- a/core/fpdfdoc/BUILD.gn
+++ b/core/fpdfdoc/BUILD.gn
@@ -84,7 +84,7 @@ jumbo_source_set("fpdfdoc") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
-    "../../:fxcrt",
+    "../fxcrt",
   ]
   visibility = [ "../../*" ]
 }
diff --git a/core/fpdftext/BUILD.gn b/core/fpdftext/BUILD.gn
index 9f3104e50a..f47745178e 100644
--- a/core/fpdftext/BUILD.gn
+++ b/core/fpdftext/BUILD.gn
@@ -18,7 +18,7 @@ jumbo_source_set("fpdftext") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
-    "../../:fxcrt",
+    "../fxcrt",
   ]
   visibility = [ "../../*" ]
 }
diff --git a/core/fxcodec/BUILD.gn b/core/fxcodec/BUILD.gn
index ec4843f700..442a058ed0 100644
--- a/core/fxcodec/BUILD.gn
+++ b/core/fxcodec/BUILD.gn
@@ -69,10 +69,10 @@ jumbo_source_set("fxcodec") {
   configs += [ "../../:pdfium_core_config" ]
   include_dirs = []
   deps = [
-    "../../:fxcrt",
     "../../third_party:fx_libopenjpeg",
     "../../third_party:lcms2",
     "../../third_party:zlib",
+    "../fxcrt",
     "//third_party:jpeg",
   ]
 
diff --git a/core/fxcrt/BUILD.gn b/core/fxcrt/BUILD.gn
new file mode 100644
index 0000000000..15a0e066e8
--- /dev/null
+++ b/core/fxcrt/BUILD.gn
@@ -0,0 +1,169 @@
+# Copyright 2018 The PDFium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/jumbo.gni")
+import("../../pdfium.gni")
+
+jumbo_source_set("fxcrt") {
+  sources = [
+    "autorestorer.h",
+    "bytestring.cpp",
+    "bytestring.h",
+    "cfx_binarybuf.cpp",
+    "cfx_binarybuf.h",
+    "cfx_bitstream.cpp",
+    "cfx_bitstream.h",
+    "cfx_datetime.cpp",
+    "cfx_datetime.h",
+    "cfx_fixedbufgrow.h",
+    "cfx_memorystream.cpp",
+    "cfx_memorystream.h",
+    "cfx_readonlymemorystream.cpp",
+    "cfx_readonlymemorystream.h",
+    "cfx_seekablemultistream.cpp",
+    "cfx_seekablemultistream.h",
+    "cfx_seekablestreamproxy.cpp",
+    "cfx_seekablestreamproxy.h",
+    "cfx_utf8decoder.cpp",
+    "cfx_utf8decoder.h",
+    "cfx_utf8encoder.cpp",
+    "cfx_utf8encoder.h",
+    "cfx_widetextbuf.cpp",
+    "cfx_widetextbuf.h",
+    "fileaccess_iface.h",
+    "fx_bidi.cpp",
+    "fx_bidi.h",
+    "fx_codepage.cpp",
+    "fx_codepage.h",
+    "fx_coordinates.cpp",
+    "fx_coordinates.h",
+    "fx_extension.cpp",
+    "fx_extension.h",
+    "fx_memory.cpp",
+    "fx_memory.h",
+    "fx_number.cpp",
+    "fx_number.h",
+    "fx_random.cpp",
+    "fx_random.h",
+    "fx_safe_types.h",
+    "fx_stream.cpp",
+    "fx_stream.h",
+    "fx_string.cpp",
+    "fx_string.h",
+    "fx_system.cpp",
+    "fx_system.h",
+    "fx_ucddata.cpp",
+    "fx_ucddata.h",
+    "fx_unicode.cpp",
+    "fx_unicode.h",
+    "maybe_owned.h",
+    "observable.h",
+    "pauseindicator_iface.h",
+    "retain_ptr.h",
+    "shared_copy_on_write.h",
+    "string_data_template.h",
+    "string_pool_template.h",
+    "string_view_template.h",
+    "unowned_ptr.h",
+    "weak_ptr.h",
+    "widestring.cpp",
+    "widestring.h",
+    "xml/cfx_xmlchardata.cpp",
+    "xml/cfx_xmlchardata.h",
+    "xml/cfx_xmldocument.cpp",
+    "xml/cfx_xmldocument.h",
+    "xml/cfx_xmlelement.cpp",
+    "xml/cfx_xmlelement.h",
+    "xml/cfx_xmlinstruction.cpp",
+    "xml/cfx_xmlinstruction.h",
+    "xml/cfx_xmlnode.cpp",
+    "xml/cfx_xmlnode.h",
+    "xml/cfx_xmlparser.cpp",
+    "xml/cfx_xmlparser.h",
+    "xml/cfx_xmltext.cpp",
+    "xml/cfx_xmltext.h",
+  ]
+  configs += [ "../../:pdfium_core_config" ]
+  visibility = [
+    "../*",
+    "../../:*",
+    "../../fpdfsdk/*",
+    "../../fxbarcode:*",
+    "../../fxjs:*",
+    "../../third_party:*",
+    "../../xfa/*",
+  ]
+  deps = [
+    "../../third_party:pdfium_base",
+  ]
+  public_deps = [
+    "../../:freetype_common",
+    "../../third_party:pdfium_base",
+    "//third_party/icu:icuuc",
+  ]
+  if (is_posix || is_fuchsia) {
+    sources += [
+      "cfx_fileaccess_posix.cpp",
+      "cfx_fileaccess_posix.h",
+    ]
+  }
+  if (is_win) {
+    sources += [
+      "cfx_fileaccess_windows.cpp",
+      "cfx_fileaccess_windows.h",
+    ]
+  }
+  if (pdf_enable_xfa) {
+    sources += [
+      "cfx_char.cpp",
+      "cfx_char.h",
+      "cfx_decimal.cpp",
+      "cfx_decimal.h",
+      "css/cfx_css.h",
+      "css/cfx_csscolorvalue.cpp",
+      "css/cfx_csscolorvalue.h",
+      "css/cfx_csscomputedstyle.cpp",
+      "css/cfx_csscomputedstyle.h",
+      "css/cfx_csscustomproperty.cpp",
+      "css/cfx_csscustomproperty.h",
+      "css/cfx_cssdata.cpp",
+      "css/cfx_cssdata.h",
+      "css/cfx_cssdeclaration.cpp",
+      "css/cfx_cssdeclaration.h",
+      "css/cfx_cssenumvalue.cpp",
+      "css/cfx_cssenumvalue.h",
+      "css/cfx_cssexttextbuf.cpp",
+      "css/cfx_cssexttextbuf.h",
+      "css/cfx_cssnumbervalue.cpp",
+      "css/cfx_cssnumbervalue.h",
+      "css/cfx_csspropertyholder.cpp",
+      "css/cfx_csspropertyholder.h",
+      "css/cfx_cssrulecollection.cpp",
+      "css/cfx_cssrulecollection.h",
+      "css/cfx_cssselector.cpp",
+      "css/cfx_cssselector.h",
+      "css/cfx_cssstringvalue.cpp",
+      "css/cfx_cssstringvalue.h",
+      "css/cfx_cssstylerule.cpp",
+      "css/cfx_cssstylerule.h",
+      "css/cfx_cssstyleselector.cpp",
+      "css/cfx_cssstyleselector.h",
+      "css/cfx_cssstylesheet.cpp",
+      "css/cfx_cssstylesheet.h",
+      "css/cfx_csssyntaxparser.cpp",
+      "css/cfx_csssyntaxparser.h",
+      "css/cfx_csstextbuf.cpp",
+      "css/cfx_csstextbuf.h",
+      "css/cfx_cssvalue.cpp",
+      "css/cfx_cssvalue.h",
+      "css/cfx_cssvaluelist.cpp",
+      "css/cfx_cssvaluelist.h",
+      "css/cfx_cssvaluelistparser.cpp",
+      "css/cfx_cssvaluelistparser.h",
+      "fx_arabic.cpp",
+      "fx_arabic.h",
+      "locale_iface.h",
+    ]
+  }
+}
diff --git a/core/fxge/BUILD.gn b/core/fxge/BUILD.gn
index 9d50e0abb0..6168fa911b 100644
--- a/core/fxge/BUILD.gn
+++ b/core/fxge/BUILD.gn
@@ -121,7 +121,7 @@ jumbo_source_set("fxge") {
   ]
 
   deps = [
-    "../../:fxcrt",
+    "../fxcrt",
   ]
 
   if (is_component_build || use_system_freetype) {
diff --git a/fpdfsdk/BUILD.gn b/fpdfsdk/BUILD.gn
index 2fc658e363..f4df1d54cd 100644
--- a/fpdfsdk/BUILD.gn
+++ b/fpdfsdk/BUILD.gn
@@ -51,7 +51,7 @@ jumbo_source_set("fpdfsdk") {
 
   configs += [ "../:pdfium_core_config" ]
   deps = [
-    "../:fxcrt",
+    "../core/fxcrt",
   ]
   visibility = [ "../*" ]
 
diff --git a/fpdfsdk/formfiller/BUILD.gn b/fpdfsdk/formfiller/BUILD.gn
index fe5ba5ed2b..a9994ee1c1 100644
--- a/fpdfsdk/formfiller/BUILD.gn
+++ b/fpdfsdk/formfiller/BUILD.gn
@@ -32,7 +32,7 @@ jumbo_source_set("formfiller") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
-    "../../:fxcrt",
+    "../../core/fxcrt",
   ]
   visibility = [ "../../*" ]
 }
diff --git a/fpdfsdk/fpdfxfa/BUILD.gn b/fpdfsdk/fpdfxfa/BUILD.gn
index 14a82818d7..bca6f67884 100644
--- a/fpdfsdk/fpdfxfa/BUILD.gn
+++ b/fpdfsdk/fpdfxfa/BUILD.gn
@@ -19,7 +19,7 @@ jumbo_source_set("fpdfxfa") {
     "cxfa_fwladaptertimermgr.h",
   ]
   deps = [
-    "../../:fxcrt",
+    "../../core/fxcrt",
     "../../fxjs",
     "../../xfa",
   ]
diff --git a/fpdfsdk/pwl/BUILD.gn b/fpdfsdk/pwl/BUILD.gn
index 47cfce7bb9..7c33196788 100644
--- a/fpdfsdk/pwl/BUILD.gn
+++ b/fpdfsdk/pwl/BUILD.gn
@@ -42,7 +42,7 @@ jumbo_source_set("pwl") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
-    "../../:fxcrt",
+    "../../core/fxcrt",
   ]
   visibility = [ "../../*" ]
 }
diff --git a/fxbarcode/BUILD.gn b/fxbarcode/BUILD.gn
index 524ca7bb8b..b5aecb8d2f 100644
--- a/fxbarcode/BUILD.gn
+++ b/fxbarcode/BUILD.gn
@@ -135,7 +135,7 @@ jumbo_source_set("fxbarcode") {
     "utils.h",
   ]
   deps = [
-    "../:fxcrt",
+    "../core/fxcrt",
     "../core/fxge",
     "../third_party:bigint",
   ]
diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn
index d885117c1b..96c3c6df2f 100644
--- a/fxjs/BUILD.gn
+++ b/fxjs/BUILD.gn
@@ -17,7 +17,7 @@ jumbo_source_set("fxjs") {
   ]
   configs += [ "../:pdfium_core_config" ]
   deps = [
-    "../:fxcrt",
+    "../core/fxcrt",
   ]
   visibility = [ "../*" ]
 
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index c66ae9e34c..a9a59ceebd 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -228,7 +228,7 @@ if (!pdf_use_skia && !pdf_use_skia_paths) {
       "agg23/agg_vcgen_stroke.cpp",
     ]
     deps = [
-      "..:fxcrt",
+      "../core/fxcrt",
     ]
   }
 }
diff --git a/xfa/fde/BUILD.gn b/xfa/fde/BUILD.gn
index ecfbbb2c6f..6466f30848 100644
--- a/xfa/fde/BUILD.gn
+++ b/xfa/fde/BUILD.gn
@@ -18,7 +18,7 @@ jumbo_source_set("fde") {
     "cfde_wordbreak_data.h",
   ]
   deps = [
-    "../../:fxcrt",
+    "../../core/fxcrt",
   ]
   configs += [
     "../../:pdfium_core_config",
diff --git a/xfa/fgas/BUILD.gn b/xfa/fgas/BUILD.gn
index 0cb74dab54..a6d2005135 100644
--- a/xfa/fgas/BUILD.gn
+++ b/xfa/fgas/BUILD.gn
@@ -35,7 +35,7 @@ jumbo_source_set("fgas") {
     "layout/cfx_txtbreak.h",
   ]
   deps = [
-    "../../:fxcrt",
+    "../../core/fxcrt",
   ]
   configs += [
     "../../:pdfium_core_config",
diff --git a/xfa/fwl/BUILD.gn b/xfa/fwl/BUILD.gn
index 6d6fbeb049..7277c320d9 100644
--- a/xfa/fwl/BUILD.gn
+++ b/xfa/fwl/BUILD.gn
@@ -121,7 +121,7 @@ jumbo_source_set("fwl") {
     "theme/cfwl_widgettp.h",
   ]
   deps = [
-    "../../:fxcrt",
+    "../../core/fxcrt",
     "../../fxbarcode",
     "../fgas",
   ]
diff --git a/xfa/fxfa/BUILD.gn b/xfa/fxfa/BUILD.gn
index a2c2f5cc72..5d1cc6bc53 100644
--- a/xfa/fxfa/BUILD.gn
+++ b/xfa/fxfa/BUILD.gn
@@ -99,7 +99,7 @@ jumbo_source_set("fxfa") {
     "fxfa_basic.h",
   ]
   deps = [
-    "../../:fxcrt",
+    "../../core/fxcrt",
     "../../fxjs",
     "../fde",
     "../fgas",
diff --git a/xfa/fxfa/parser/BUILD.gn b/xfa/fxfa/parser/BUILD.gn
index faf618e704..97b834a780 100644
--- a/xfa/fxfa/parser/BUILD.gn
+++ b/xfa/fxfa/parser/BUILD.gn
@@ -699,7 +699,7 @@ jumbo_source_set("parser") {
     "xfa_utils.h",
   ]
   deps = [
-    "../../../:fxcrt",
+    "../../../core/fxcrt",
     "../../../fxjs",
     "../../fde",
     "../../fgas",