Merge to XFA: Fix all relative includes to third_party.

samples/BUILD.gn

 # Copyright 2014 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("../pdfium.gni")
 
 group("samples") {
   testonly = true
   deps = [
     ":pdfium_test",
   ]
 }
 
 config("pdfium_samples_config") {
   defines = [
     "PNG_PREFIX",
     "PNGPREFIX_H",
     "PNG_USE_READ_MACROS",
   ]
+  include_dirs = [ ".." ]
   if (pdf_enable_v8) {
     defines += [ "PDF_ENABLE_V8", ]
   }
   if (pdf_enable_xfa) {
     defines += [ "PDF_ENABLE_XFA", ]
   }
 }
 
 executable("pdfium_test") {
   testonly = true
   sources = [
     "image_diff_png.cc",
     "pdfium_test.cc",
   ]
   deps = [
     "//third_party/pdfium:pdfium",
     "//third_party/pdfium:test_support",
+
+    # Regardless of whether the library ships against system freetype,

[Lei Zhang, 2015/11/06 04:26:32]

Synced this to master. I will spin this off into a separate CL. I suspect this
is why the XFA corpus tests are broken.

[Tom Sepez, 2015/11/06 18:02:11]

I expect this helps less than one would think, but yeah.

+    # always link this binary against the bundled one for consistency
+    # of results across platforms.
+    "//third_party/pdfium/third_party:fx_freetype",
+    ":fx_lpng",
   ]
   if (pdf_enable_v8) {
-    deps += [
-      "//v8:v8_libplatform",
-    ]
+    deps += [ "//v8:v8_libplatform" ]
     include_dirs = [
       "//v8",
       "//v8/include",
     ]
   }
   configs += [ ":pdfium_samples_config" ]
 }
 
 executable("pdfium_diff") {
   testonly = true
   sources = [
     "image_diff.cc",
     "image_diff_png.cc",
     "image_diff_png.h",
   ]
   deps = [
     "//third_party/pdfium",
   ]
   configs += [ ":pdfium_samples_config" ]
 }