2 files changed, 74 insertions, 43 deletions
diff --git a/core/fxcrt/BUILD.gn b/core/fxcrt/BUILD.gn
index 15a0e066e8..4de938bcc7 100644
--- a/core/fxcrt/BUILD.gn
+++ b/core/fxcrt/BUILD.gn
@@ -21,8 +21,6 @@ jumbo_source_set("fxcrt") {
     "cfx_memorystream.h",
     "cfx_readonlymemorystream.cpp",
     "cfx_readonlymemorystream.h",
-    "cfx_seekablemultistream.cpp",
-    "cfx_seekablemultistream.h",
     "cfx_seekablestreamproxy.cpp",
     "cfx_seekablestreamproxy.h",
     "cfx_utf8decoder.cpp",
@@ -120,50 +118,23 @@ jumbo_source_set("fxcrt") {
       "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",
     ]
   }
 }
+
+if (pdf_enable_xfa) {
+  jumbo_source_set("seekablemultistream") {
+    sources = [
+      "cfx_seekablemultistream.cpp",
+      "cfx_seekablemultistream.h",
+    ]
+    deps = [
+      ":fxcrt",
+      "../fpdfapi",
+    ]
+    visibility = [ "../../*" ]
+  }
+}
diff --git a/core/fxcrt/css/BUILD.gn b/core/fxcrt/css/BUILD.gn
new file mode 100644
index 0000000000..99b7853751
--- /dev/null
+++ b/core/fxcrt/css/BUILD.gn
@@ -0,0 +1,60 @@
+# 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")
+
+assert(pdf_enable_xfa)
+
+jumbo_source_set("css") {
+  sources = [
+    "cfx_css.h",
+    "cfx_csscolorvalue.cpp",
+    "cfx_csscolorvalue.h",
+    "cfx_csscomputedstyle.cpp",
+    "cfx_csscomputedstyle.h",
+    "cfx_csscustomproperty.cpp",
+    "cfx_csscustomproperty.h",
+    "cfx_cssdata.cpp",
+    "cfx_cssdata.h",
+    "cfx_cssdeclaration.cpp",
+    "cfx_cssdeclaration.h",
+    "cfx_cssenumvalue.cpp",
+    "cfx_cssenumvalue.h",
+    "cfx_cssexttextbuf.cpp",
+    "cfx_cssexttextbuf.h",
+    "cfx_cssnumbervalue.cpp",
+    "cfx_cssnumbervalue.h",
+    "cfx_csspropertyholder.cpp",
+    "cfx_csspropertyholder.h",
+    "cfx_cssrulecollection.cpp",
+    "cfx_cssrulecollection.h",
+    "cfx_cssselector.cpp",
+    "cfx_cssselector.h",
+    "cfx_cssstringvalue.cpp",
+    "cfx_cssstringvalue.h",
+    "cfx_cssstylerule.cpp",
+    "cfx_cssstylerule.h",
+    "cfx_cssstyleselector.cpp",
+    "cfx_cssstyleselector.h",
+    "cfx_cssstylesheet.cpp",
+    "cfx_cssstylesheet.h",
+    "cfx_csssyntaxparser.cpp",
+    "cfx_csssyntaxparser.h",
+    "cfx_csstextbuf.cpp",
+    "cfx_csstextbuf.h",
+    "cfx_cssvalue.cpp",
+    "cfx_cssvalue.h",
+    "cfx_cssvaluelist.cpp",
+    "cfx_cssvaluelist.h",
+    "cfx_cssvaluelistparser.cpp",
+    "cfx_cssvaluelistparser.h",
+  ]
+  deps = [
+    "../",
+    "../../fxge",
+  ]
+  configs += [ "../../../:pdfium_core_config" ]
+  visibility = [ "../../../*" ]
+}