Merge to XFA: Fix all relative includes to third_party.

samples/BUILD.gn

Index: samples/BUILD.gn
diff --git a/samples/BUILD.gn b/samples/BUILD.gn
index 2039d2f4dd777793a8520266dbd255eb2e712f47..5e91b81798a5c147bae7c2ecf137aacba454236e 100644
--- a/samples/BUILD.gn
+++ b/samples/BUILD.gn
@@ -17,6 +17,7 @@ config("pdfium_samples_config") {
     "PNGPREFIX_H",
     "PNG_USE_READ_MACROS",
   ]
+  include_dirs = [ ".." ]
   if (pdf_enable_v8) {
     defines += [ "PDF_ENABLE_V8", ]
   }
@@ -34,11 +35,15 @@ executable("pdfium_test") {
   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",