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, 3 insertions, 8 deletions

diff --git a/xfa.gyp b/xfa.gyp
index 8302e8d889..41497f72e6 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -11,15 +11,10 @@
     {
       "target_name":"xfa",
       "type":"static_library",
-      'dependencies': [
-        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-      ],
-      'export_dependent_settings': [
-        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-      ],
       'include_dirs': [
-        '<(DEPTH)/v8',
-        '<(DEPTH)/v8/include',
+        # This is implicit in GN.
+        '<(DEPTH)',
+        '.',
         'third_party/freetype/include',
         'third_party/freetype/include/freetype',
       ],