Merge to XFA: Fix all relative includes to third_party.

BUILD.gn

 # Copyright 2014 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("//testing/test.gni")
 import("pdfium.gni")
 
 config("pdfium_config") {
   cflags = []
   include_dirs = [
+    ".",
     "third_party/freetype/include",
     "third_party/freetype/include/freetype",
   ]
   defines = [
     "OPJ_STATIC",
     "PNG_PREFIX",
     "PNGPREFIX_H",
     "PNG_USE_READ_MACROS",
     "V8_DEPRECATION_WARNINGS",
     "_CRT_SECURE_NO_WARNINGS",
@@ skipping 21 matching lines @@
   }
 
   if (is_win) {
     cflags += [
       "/wd4005",
       "/wd4018",
       "/wd4146",
       "/wd4333",
       "/wd4345",
       "/wd4267",
+
       # TODO(thestig): Fix all instances, remove this, pdfium:29
       "/wd4245",
       "/wd4310",
       "/wd4389",
       "/wd4701",
       "/wd4702",
       "/wd4706",
       "/wd4800",
     ]
   }
@@ skipping 100 matching lines @@
     "testing/fx_string_testhelpers.cpp",
     "testing/fx_string_testhelpers.h",
     "testing/test_support.cpp",
     "testing/test_support.h",
   ]
   deps = [
     "//testing/gmock",
     "//testing/gtest",
     ":pdfium",
   ]
-  include_dirs = [
-    "."
-  ]
+  include_dirs = []
   if (pdf_enable_v8) {
     deps += [
       "//v8",
       "//v8:v8_libplatform",
     ]
     include_dirs += [
       "//v8",
       "//v8/include",
     ]
   }
@@ skipping 173 matching lines @@
     "core/src/fpdftext/unicodenormalization.cpp",
     "core/src/fpdftext/unicodenormalizationdata.cpp",
     "core/src/fpdftext/unicodenormalizationdata.h",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("fxcodec") {
   deps = [
     "third_party:fx_lcms2",
-    "third_party:fx_libjpeg",
     "third_party:fx_libopenjpeg",
     "third_party:fx_lpng",
     "third_party:fx_tiff",
     "third_party:fx_zlib",
+
+    # This is a generic JPEG library dependency.
+    "//third_party:jpeg",
   ]
   sources = [
     "core/include/fxcodec/fx_codec.h",
     "core/include/fxcodec/fx_codec_def.h",
     "core/include/fxcodec/fx_codec_flate.h",
     "core/src/fxcodec/codec/codec_int.h",
     "core/src/fxcodec/codec/fx_codec.cpp",
     "core/src/fxcodec/codec/fx_codec_bmp.cpp",
     "core/src/fxcodec/codec/fx_codec_fax.cpp",
     "core/src/fxcodec/codec/fx_codec_flate.cpp",
@@ skipping 43 matching lines @@
     "core/src/fxcodec/jbig2/JBig2_Segment.h",
     "core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp",
     "core/src/fxcodec/jbig2/JBig2_SymbolDict.h",
     "core/src/fxcodec/jbig2/JBig2_TrdProc.cpp",
     "core/src/fxcodec/jbig2/JBig2_TrdProc.h",
     "core/src/fxcodec/lbmp/fx_bmp.cpp",
     "core/src/fxcodec/lbmp/fx_bmp.h",
     "core/src/fxcodec/lgif/fx_gif.cpp",
     "core/src/fxcodec/lgif/fx_gif.h",
   ]
+  include_dirs = []
 
   if (is_posix) {
     # core/src/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_config" ]
 }
 
 config("fxge_warnings") {
@@ skipping 79 matching lines @@
     "core/src/fxge/apple/apple_int.h",
     "core/src/fxge/apple/fx_apple_platform.cpp",
     "core/src/fxge/apple/fx_mac_imp.cpp",
     "core/src/fxge/apple/fx_quartz_device.cpp",
     "core/src/fxge/dib/dib_int.h",
     "core/src/fxge/dib/fx_dib_composite.cpp",
     "core/src/fxge/dib/fx_dib_convert.cpp",
     "core/src/fxge/dib/fx_dib_engine.cpp",
     "core/src/fxge/dib/fx_dib_main.cpp",
     "core/src/fxge/dib/fx_dib_transform.cpp",
-    "core/src/fxge/fontdata/chromefontdata/chromefontdata.h",
     "core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitFixed.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSans.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSerif.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c",
+    "core/src/fxge/fontdata/chromefontdata/chromefontdata.h",
     "core/src/fxge/freetype/fx_freetype.c",
     "core/src/fxge/ge/fx_ge.cpp",
     "core/src/fxge/ge/fx_ge_device.cpp",
     "core/src/fxge/ge/fx_ge_font.cpp",
     "core/src/fxge/ge/fx_ge_fontmap.cpp",
     "core/src/fxge/ge/fx_ge_linux.cpp",
     "core/src/fxge/ge/fx_ge_path.cpp",
     "core/src/fxge/ge/fx_ge_ps.cpp",
     "core/src/fxge/ge/fx_ge_text.cpp",
     "core/src/fxge/ge/text_int.h",
@@ skipping 12 matching lines @@
     include_dirs = [
       "//third_party/skia/include/config",
       "//third_party/skia/include/core",
       "//third_party/skia/include/effects",
       "//third_party/skia/include/images",
       "//third_party/skia/include/lazy",
       "//third_party/skia/include/pathops",
       "//third_party/skia/include/utils",
       "//third_party/skia/src/core",
     ]
-    deps = [ "//skia" ]
+    deps = [
+      "//skia",
+    ]
   }
 
   if (is_win) {
     sources += [
       "core/src/fxge/win32/dwrite_int.h",
       "core/src/fxge/win32/fx_win32_device.cpp",
       "core/src/fxge/win32/fx_win32_dib.cpp",
       "core/src/fxge/win32/fx_win32_dwrite.cpp",
       "core/src/fxge/win32/fx_win32_gdipext.cpp",
       "core/src/fxge/win32/fx_win32_print.cpp",
@@ skipping 62 matching lines @@
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("javascript") {
   sources = [
     "fpdfsdk/include/javascript/IJavaScript.h",
   ]
   if (pdf_enable_v8) {
     sources += [
+      "fpdfsdk/include/jsapi/fxjs_v8.h",
       "fpdfsdk/src/javascript/Consts.cpp",
       "fpdfsdk/src/javascript/Consts.h",
       "fpdfsdk/src/javascript/Document.cpp",
       "fpdfsdk/src/javascript/Document.h",
       "fpdfsdk/src/javascript/Field.cpp",
       "fpdfsdk/src/javascript/Field.h",
       "fpdfsdk/src/javascript/Icon.cpp",
       "fpdfsdk/src/javascript/Icon.h",
       "fpdfsdk/src/javascript/JS_Context.cpp",
       "fpdfsdk/src/javascript/JS_Context.h",
@@ skipping 19 matching lines @@
       "fpdfsdk/src/javascript/event.cpp",
       "fpdfsdk/src/javascript/event.h",
       "fpdfsdk/src/javascript/global.cpp",
       "fpdfsdk/src/javascript/global.h",
       "fpdfsdk/src/javascript/report.cpp",
       "fpdfsdk/src/javascript/report.h",
       "fpdfsdk/src/javascript/resource.cpp",
       "fpdfsdk/src/javascript/resource.h",
       "fpdfsdk/src/javascript/util.cpp",
       "fpdfsdk/src/javascript/util.h",
-      "fpdfsdk/include/jsapi/fxjs_v8.h",
       "fpdfsdk/src/jsapi/fxjs_v8.cpp",
     ]
     include_dirs = [
       "//v8",
       "//v8/include",
     ]
     public_deps = [
       "//v8",
     ]
   } else {
@@ skipping 681 matching lines @@
     "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp",
     "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h",
     "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp",
     "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h",
     "xfa/src/fxfa/src/parser/xfa_utils_imp.cpp",
     "xfa/src/fxgraphics/src/fx_graphics.cpp",
     "xfa/src/fxgraphics/src/fx_path_generator.cpp",
     "xfa/src/fxgraphics/src/fx_path_generator.h",
     "xfa/src/fxgraphics/src/pre.h",
   ]
+  include_dirs = [
+    ".",
+  ]
   if (pdf_enable_v8) {
     sources += [
       "xfa/src/fxjse/src/class.cpp",
       "xfa/src/fxjse/src/class.h",
       "xfa/src/fxjse/src/context.cpp",
       "xfa/src/fxjse/src/context.h",
       "xfa/src/fxjse/src/dynprop.cpp",
       "xfa/src/fxjse/src/runtime.cpp",
       "xfa/src/fxjse/src/runtime.h",
       "xfa/src/fxjse/src/scope_inline.h",
@@ skipping 35 matching lines @@
     "third_party/base/nonstd_unique_ptr_unittest.cpp",
     "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp",
     "xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp",
   ]
   deps = [
     "//testing/gtest",
     "//testing/gtest:gtest_main",
     ":pdfium",
     ":test_support",
   ]
-  include_dirs = [ "." ]
   configs += [ ":pdfium_config" ]
 }
 
 test("pdfium_embeddertests") {
   sources = [
     "core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp",
     "core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
     "fpdfsdk/src/fpdf_dataavail_embeddertest.cpp",
     "fpdfsdk/src/fpdfdoc_embeddertest.cpp",
     "fpdfsdk/src/fpdfformfill_embeddertest.cpp",
     "fpdfsdk/src/fpdftext_embeddertest.cpp",
     "fpdfsdk/src/fpdfview_c_api_test.c",
     "fpdfsdk/src/fpdfview_c_api_test.h",
     "fpdfsdk/src/fpdfview_embeddertest.cpp",
     "testing/embedder_test.cpp",
     "testing/embedder_test.h",
     "testing/embedder_test_mock_delegate.h",
     "testing/embedder_test_timer_handling_delegate.h",
     "xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp",
   ]
   deps = [
     "//testing/gmock",
     "//testing/gtest",
     ":pdfium",
     ":test_support",
   ]
-  include_dirs = [
-    "."
-  ]
+  include_dirs = []
   if (pdf_enable_v8) {
-    sources += [
-     "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp"
-    ]
+    sources += [ "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp" ]
     deps += [
       "//v8",
       "//v8:v8_libplatform",
     ]
     include_dirs += [
       "//v8",
       "//v8/include",
     ]
   }
   configs += [ ":pdfium_config" ]
 }