Revert of Fix gn gn --check complaints about fxcrt.

BUILD.gn

 # Copyright 2016 The Chromium 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_overrides/v8.gni")
 import("//testing/test.gni")
 import("pdfium.gni")
 
 config("pdfium_common_config") {
   cflags = []
@@ skipping 124 matching lines @@
     ":fxcodec",
     ":fxcrt",
     ":fxedit",
     ":fxge",
     ":javascript",
     ":pdfwindow",
     "third_party:bigint",
     "third_party:pdfium_base",
   ]
 
-  public_deps = [
-    ":fxcrt",
-  ]
   if (pdf_enable_xfa) {
     sources += [
       "fpdfsdk/cpdfsdk_xfawidget.cpp",
       "fpdfsdk/cpdfsdk_xfawidgethandler.cpp",
       "fpdfsdk/include/cpdfsdk_xfawidget.h",
       "fpdfsdk/include/cpdfsdk_xfawidgethandler.h",
     ]
 
     deps += [ ":fpdfxfa" ]
   }
@@ skipping 57 matching lines @@
 ]
 
 static_library("fdrm") {
   sources = [
     "core/fdrm/crypto/fx_crypt.cpp",
     "core/fdrm/crypto/fx_crypt_aes.cpp",
     "core/fdrm/crypto/fx_crypt_sha.cpp",
     "core/fdrm/crypto/include/fx_crypt.h",
   ]
   configs += [ ":pdfium_core_config" ]
-  deps = [
-    ":fxcrt",
-  ]
 }
 
 static_library("fpdfdoc") {
   sources = [
     "core/fpdfdoc/cline.cpp",
     "core/fpdfdoc/cline.h",
     "core/fpdfdoc/clines.cpp",
     "core/fpdfdoc/clines.h",
     "core/fpdfdoc/cpdf_aaction.cpp",
     "core/fpdfdoc/cpdf_action.cpp",
@@ skipping 71 matching lines @@
     "core/fpdfdoc/include/cpvt_wordplace.h",
     "core/fpdfdoc/include/cpvt_wordprops.h",
     "core/fpdfdoc/include/cpvt_wordrange.h",
     "core/fpdfdoc/include/fpdf_tagged.h",
     "core/fpdfdoc/include/ipdf_formnotify.h",
     "core/fpdfdoc/include/ipvt_fontmap.h",
     "core/fpdfdoc/ipdf_formnotify.cpp",
     "core/fpdfdoc/tagged_int.h",
   ]
   configs += [ ":pdfium_core_config" ]
-  deps = [
-    ":fxcrt",
-  ]
 }
 
 static_library("fpdfapi") {
   sources = [
     "core/fpdfapi/cpdf_modulemgr.cpp",
     "core/fpdfapi/cpdf_pagerendercontext.cpp",
     "core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp",
     "core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp",
     "core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp",
     "core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp",
@@ skipping 209 matching lines @@
     "core/fpdfapi/fpdf_render/fpdf_render_text.cpp",
     "core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h",
     "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h",
     "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h",
     "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h",
     "core/fpdfapi/fpdf_render/render_int.h",
     "core/fpdfapi/include/cpdf_modulemgr.h",
     "core/fpdfapi/include/cpdf_pagerendercontext.h",
   ]
   configs += [ ":pdfium_core_config" ]
-  deps = [
-    ":fxcrt",
-  ]
 }
 
 static_library("fpdftext") {
   sources = [
     "core/fpdftext/cpdf_linkextract.cpp",
     "core/fpdftext/cpdf_textpage.cpp",
     "core/fpdftext/cpdf_textpagefind.cpp",
     "core/fpdftext/include/cpdf_linkextract.h",
     "core/fpdftext/include/cpdf_textpage.h",
     "core/fpdftext/include/cpdf_textpagefind.h",
     "core/fpdftext/unicodenormalizationdata.cpp",
     "core/fpdftext/unicodenormalizationdata.h",
   ]
   configs += [ ":pdfium_core_config" ]
-  deps = [
-    ":fxcrt",
-  ]
 }
 
 static_library("fxcodec") {
+  deps = [
+    "third_party:fx_lcms2",
+    "third_party:fx_libopenjpeg",
+    "third_party:fx_zlib",
+
+    # This is a generic JPEG library dependency.
+    "//third_party:jpeg",
+  ]
   sources = [
     "core/fxcodec/codec/ccodec_basicmodule.h",
     "core/fxcodec/codec/ccodec_faxmodule.h",
     "core/fxcodec/codec/ccodec_flatemodule.h",
     "core/fxcodec/codec/ccodec_iccmodule.h",
     "core/fxcodec/codec/ccodec_jbig2module.h",
     "core/fxcodec/codec/ccodec_jpegmodule.h",
     "core/fxcodec/codec/ccodec_jpxmodule.h",
     "core/fxcodec/codec/ccodec_scanlinedecoder.h",
     "core/fxcodec/codec/codec_int.h",
@@ skipping 40 matching lines @@
     "core/fxcodec/jbig2/JBig2_PddProc.h",
     "core/fxcodec/jbig2/JBig2_SddProc.cpp",
     "core/fxcodec/jbig2/JBig2_SddProc.h",
     "core/fxcodec/jbig2/JBig2_Segment.cpp",
     "core/fxcodec/jbig2/JBig2_Segment.h",
     "core/fxcodec/jbig2/JBig2_SymbolDict.cpp",
     "core/fxcodec/jbig2/JBig2_SymbolDict.h",
     "core/fxcodec/jbig2/JBig2_TrdProc.cpp",
     "core/fxcodec/jbig2/JBig2_TrdProc.h",
   ]
-  configs += [ ":pdfium_core_config" ]
   include_dirs = []
-  deps = [
-    ":fxcrt",
-    "third_party:fx_lcms2",
-    "third_party:fx_libopenjpeg",
-    "third_party:fx_zlib",
-
-    # This is a generic JPEG library dependency.
-    "//third_party:jpeg",
-  ]
-
   if (pdf_enable_xfa) {
     sources += [
       "core/fxcodec/codec/ccodec_bmpmodule.h",
       "core/fxcodec/codec/ccodec_gifmodule.h",
       "core/fxcodec/codec/ccodec_pngmodule.h",
       "core/fxcodec/codec/ccodec_tiffmodule.h",
       "core/fxcodec/codec/fx_codec_bmp.cpp",
       "core/fxcodec/codec/fx_codec_gif.cpp",
       "core/fxcodec/codec/fx_codec_png.cpp",
       "core/fxcodec/codec/fx_codec_progress.cpp",
       "core/fxcodec/codec/fx_codec_tiff.cpp",
       "core/fxcodec/codec/include/ccodec_progressivedecoder.h",
       "core/fxcodec/lbmp/fx_bmp.cpp",
       "core/fxcodec/lbmp/fx_bmp.h",
       "core/fxcodec/lgif/fx_gif.cpp",
       "core/fxcodec/lgif/fx_gif.h",
     ]
     deps += [
       "third_party:fx_lpng",
       "third_party:fx_tiff",
     ]
   }
   if (is_posix) {
     # core/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
     # conversion to check that an address is 16-bit aligned (benign).
     cflags_c = [ "-Wno-pointer-to-int-cast" ]
   }
+  configs += [ ":pdfium_core_config" ]
 }
 
 config("fxge_warnings") {
   if (is_clang) {
     cflags = [
       # http://code.google.com/p/pdfium/issues/detail?id=188
       "-Wno-switch",
     ]
   }
 }
@@ skipping 35 matching lines @@
     "core/fxcrt/include/fx_safe_types.h",
     "core/fxcrt/include/fx_stream.h",
     "core/fxcrt/include/fx_string.h",
     "core/fxcrt/include/fx_system.h",
     "core/fxcrt/include/fx_ucd.h",
     "core/fxcrt/include/fx_xml.h",
     "core/fxcrt/plex.h",
     "core/fxcrt/xml_int.h",
   ]
   configs += [ ":pdfium_core_config" ]
-  visibility += [ "//third_party:*" ]
-  deps = [
-    "//third_party:pdfium_base",
-  ]
-  public_deps = [
-    "//third_party:pdfium_base",
-  ]
 
   if (pdf_enable_xfa) {
     sources += [
       "core/fxcrt/fx_arabic.cpp",
       "core/fxcrt/fx_basic_maps.cpp",
       "core/fxcrt/include/fx_arabic.h",
       "core/fxcrt/include/fx_arb.h",
     ]
   }
 }
@@ skipping 79 matching lines @@
     "core/fxge/include/ifx_renderdevicedriver.h",
     "core/fxge/include/ifx_systemfontinfo.h",
     "core/fxge/win32/cfx_windowsdib.h",
   ]
 
   configs += [
     ":fxge_warnings",
     ":pdfium_core_config",
   ]
 
-  deps = [
-    ":fxcrt",
-  ]
-
   if (pdf_enable_xfa) {
     sources += [
       "core/fxge/ge/cfx_unicodeencodingex.cpp",
       "core/fxge/include/cfx_unicodeencodingex.h",
     ]
   }
 
   if (pdf_use_skia) {
     sources += [ "core/fxge/skia/fx_skia_device.cpp" ]
-    deps += [ "//skia" ]
+    deps = [
+      "//skia",
+    ]
   } else {
     sources += [
       "core/fxge/agg/fx_agg_driver.cpp",
       "core/fxge/agg/fx_agg_driver.h",
       "core/fxge/apple/fx_apple_platform.cpp",
     ]
-    deps += [ "third_party:fx_agg" ]
+    deps = [
+      "third_party:fx_agg",
+    ]
   }
 
   if (is_win) {
     sources += [
       "core/fxge/win32/dwrite_int.h",
       "core/fxge/win32/fx_win32_device.cpp",
       "core/fxge/win32/fx_win32_dib.cpp",
       "core/fxge/win32/fx_win32_dwrite.cpp",
       "core/fxge/win32/fx_win32_gdipext.cpp",
       "core/fxge/win32/fx_win32_print.cpp",
       "core/fxge/win32/win32_int.h",
     ]
     configs -= [ "//build/config/win:lean_and_mean" ]
   }
 }
 
 static_library("fxedit") {
   sources = [
     "fpdfsdk/fxedit/fxet_ap.cpp",
     "fpdfsdk/fxedit/fxet_edit.cpp",
     "fpdfsdk/fxedit/fxet_list.cpp",
     "fpdfsdk/fxedit/include/fx_edit.h",
     "fpdfsdk/fxedit/include/fxet_edit.h",
     "fpdfsdk/fxedit/include/fxet_list.h",
   ]
   configs += [ ":pdfium_core_config" ]
-  deps = [
-    ":fxcrt",
-  ]
 }
 
 static_library("pdfwindow") {
   sources = [
     "fpdfsdk/pdfwindow/PWL_Button.cpp",
     "fpdfsdk/pdfwindow/PWL_Button.h",
     "fpdfsdk/pdfwindow/PWL_Caret.cpp",
     "fpdfsdk/pdfwindow/PWL_Caret.h",
     "fpdfsdk/pdfwindow/PWL_ComboBox.cpp",
     "fpdfsdk/pdfwindow/PWL_ComboBox.h",
@@ skipping 10 matching lines @@
     "fpdfsdk/pdfwindow/PWL_ScrollBar.cpp",
     "fpdfsdk/pdfwindow/PWL_ScrollBar.h",
     "fpdfsdk/pdfwindow/PWL_SpecialButton.cpp",
     "fpdfsdk/pdfwindow/PWL_SpecialButton.h",
     "fpdfsdk/pdfwindow/PWL_Utils.cpp",
     "fpdfsdk/pdfwindow/PWL_Utils.h",
     "fpdfsdk/pdfwindow/PWL_Wnd.cpp",
     "fpdfsdk/pdfwindow/PWL_Wnd.h",
   ]
   configs += [ ":pdfium_core_config" ]
-  deps = [
-    ":fxcrt",
-  ]
 }
 
 static_library("javascript") {
   sources = [
     "fpdfsdk/javascript/ijs_context.h",
     "fpdfsdk/javascript/ijs_runtime.h",
   ]
-  configs += [ ":pdfium_core_config" ]
-  deps = [
-    ":fxcrt",
-  ]
-
   if (pdf_enable_v8) {
     sources += [
       "fpdfsdk/javascript/Annot.cpp",
       "fpdfsdk/javascript/Annot.h",
       "fpdfsdk/javascript/Consts.cpp",
       "fpdfsdk/javascript/Consts.h",
       "fpdfsdk/javascript/Document.cpp",
       "fpdfsdk/javascript/Document.h",
       "fpdfsdk/javascript/Field.cpp",
       "fpdfsdk/javascript/Field.h",
@@ skipping 26 matching lines @@
       "fpdfsdk/javascript/event.h",
       "fpdfsdk/javascript/global.cpp",
       "fpdfsdk/javascript/global.h",
       "fpdfsdk/javascript/report.cpp",
       "fpdfsdk/javascript/report.h",
       "fpdfsdk/javascript/resource.cpp",
       "fpdfsdk/javascript/resource.h",
       "fpdfsdk/javascript/util.cpp",
       "fpdfsdk/javascript/util.h",
     ]
-    deps += [ ":fxjs" ]
+    deps = [
+      ":fxjs",
+    ]
     configs += [ "//v8:external_startup_data" ]
   } else {
     sources += [ "fpdfsdk/javascript/JS_Runtime_Stub.cpp" ]
   }
+  configs += [ ":pdfium_core_config" ]
 }
 
 static_library("formfiller") {
   sources = [
     "fpdfsdk/formfiller/cba_fontmap.cpp",
     "fpdfsdk/formfiller/cba_fontmap.h",
     "fpdfsdk/formfiller/cffl_checkbox.cpp",
     "fpdfsdk/formfiller/cffl_checkbox.h",
     "fpdfsdk/formfiller/cffl_combobox.cpp",
     "fpdfsdk/formfiller/cffl_combobox.h",
     "fpdfsdk/formfiller/cffl_formfiller.cpp",
     "fpdfsdk/formfiller/cffl_formfiller.h",
     "fpdfsdk/formfiller/cffl_iformfiller.cpp",
     "fpdfsdk/formfiller/cffl_iformfiller.h",
     "fpdfsdk/formfiller/cffl_listbox.cpp",
     "fpdfsdk/formfiller/cffl_listbox.h",
     "fpdfsdk/formfiller/cffl_pushbutton.cpp",
     "fpdfsdk/formfiller/cffl_pushbutton.h",
     "fpdfsdk/formfiller/cffl_radiobutton.cpp",
     "fpdfsdk/formfiller/cffl_radiobutton.h",
     "fpdfsdk/formfiller/cffl_textfield.cpp",
     "fpdfsdk/formfiller/cffl_textfield.h",
   ]
   configs += [ ":pdfium_core_config" ]
-  deps = [
-    ":fxcrt",
-  ]
 }
 
 if (pdf_enable_v8) {
   static_library("fxjs") {
     sources = [
       "fxjs/fxjs_v8.cpp",
       "fxjs/include/fxjs_v8.h",
     ]
-    configs += [ ":pdfium_core_config" ]
-    deps = [
-      ":fxcrt",
-      "//v8",
-      "//v8:v8_libplatform",
-    ]
-    include_dirs = [
-      "//v8",
-      "//v8/include",
-    ]
-    public_deps = [
-      "//v8",
-    ]
-
     if (pdf_enable_xfa) {
       sources += [
         "fxjs/cfxjse_arguments.cpp",
         "fxjs/cfxjse_class.cpp",
         "fxjs/cfxjse_context.cpp",
         "fxjs/cfxjse_isolatetracker.cpp",
         "fxjs/cfxjse_isolatetracker.h",
         "fxjs/cfxjse_runtimedata.cpp",
         "fxjs/cfxjse_runtimedata.h",
         "fxjs/cfxjse_value.cpp",
         "fxjs/include/cfxjse_arguments.h",
         "fxjs/include/cfxjse_class.h",
         "fxjs/include/cfxjse_context.h",
         "fxjs/include/cfxjse_value.h",
         "fxjs/include/fxjse.h",
       ]
     }
+    deps = [
+      "//v8",
+      "//v8:v8_libplatform",
+    ]
+    configs += [ ":pdfium_core_config" ]
+    include_dirs = [
+      "//v8",
+      "//v8/include",
+    ]
+    public_deps = [
+      "//v8",
+    ]
   }
 }
 
 if (pdf_enable_xfa) {
   static_library("fpdfxfa") {
     sources = [
       "fpdfsdk/fpdfxfa/fpdfxfa_app.cpp",
       "fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp",
       "fpdfsdk/fpdfxfa/fpdfxfa_page.cpp",
       "fpdfsdk/fpdfxfa/fpdfxfa_util.cpp",
       "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h",
       "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h",
       "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h",
       "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h",
     ]
     deps = [
-      ":fxcrt",
       ":xfa",
     ]
     configs += [ ":pdfium_core_config" ]
   }
 
   static_library("xfa") {
     sources = [
       "xfa/fde/cfde_path.cpp",
       "xfa/fde/cfde_path.h",
       "xfa/fde/cfde_txtedtbuf.cpp",
@@ skipping 542 matching lines @@
       "xfa/fxgraphics/cfx_path_generator.cpp",
       "xfa/fxgraphics/cfx_path_generator.h",
       "xfa/fxgraphics/cfx_pattern.cpp",
       "xfa/fxgraphics/cfx_pattern.h",
       "xfa/fxgraphics/cfx_shading.cpp",
       "xfa/fxgraphics/cfx_shading.h",
       "xfa/fxgraphics/include/cfx_graphics.h",
     ]
     include_dirs = [ "." ]
     deps = [
-      ":fxcrt",
       ":fxjs",
     ]
     configs += [
       ":pdfium_core_config",
       ":xfa_warnings",
     ]
   }
 }
 
 test("pdfium_unittests") {
@@ skipping 115 matching lines @@
 }
 
 if (pdf_is_standalone) {
   source_set("samples") {
     testonly = true
     deps = [
       "//samples",
     ]
   }
 }