Merge to XFA: Fix all relative includes to third_party.

- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
- And fix XFA's lack of #includes.

BUG=541704
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1425153006 .

(cherry picked from commit 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c)

Review URL: https://codereview.chromium.org/1434543003 .

1 files changed, 13 insertions, 4 deletions

diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 7f27327ea5..16adbf70fd 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -44,6 +44,7 @@ source_set("fx_freetype") {
   configs += [
     "//build/config/compiler:no_chromium_code",
     "//third_party/pdfium:pdfium_config",
+
     # Must be after no_chromium_code for warning flags to be ordered correctly.
     ":fx_freetype_warnings",
   ]
@@ -94,6 +95,7 @@ source_set("fx_agg") {
   configs += [
     "//build/config/compiler:no_chromium_code",
     "//third_party/pdfium:pdfium_config",
+
     # Must be after no_chromium_code for warning flags to be ordered correctly.
     ":fx_agg_warnings",
   ]
@@ -118,9 +120,14 @@ source_set("fx_agg") {
 
 config("fx_lcms2_warnings") {
   if (is_clang) {
-    # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
-    # library doesn't appear to have this problem.
-    cflags = [ "-Wno-missing-braces" ]
+    cflags = [
+      # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
+      # library doesn't appear to have this problem.
+      "-Wno-missing-braces",
+
+      # FindPrev() in cmsplugin.c is unused.
+      "-Wno-unused-function",
+    ]
   }
 }
 
@@ -129,6 +136,7 @@ source_set("fx_lcms2") {
   configs += [
     "//build/config/compiler:no_chromium_code",
     "//third_party/pdfium:pdfium_config",
+
     # Must be after no_chromium_code for warning flags to be ordered correctly.
     ":fx_lcms2_warnings",
   ]
@@ -163,7 +171,8 @@ source_set("fx_lcms2") {
   ]
 }
 
-source_set("fx_libjpeg") {
+# This is only used for standalone builds.
+source_set("jpeg") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     "//build/config/compiler:no_chromium_code",