From 8241df7edc53b8777e7f71ff379fa53f368c3a28 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 6 Nov 2015 14:38:48 -0800 Subject: 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 . --- samples/samples.gyp | 1 + 1 file changed, 1 insertion(+) (limited to 'samples/samples.gyp') diff --git a/samples/samples.gyp b/samples/samples.gyp index 97181ba208..ff7b05823c 100644 --- a/samples/samples.gyp +++ b/samples/samples.gyp @@ -15,6 +15,7 @@ 'include_dirs': [ # This is implicit in GN. '<(DEPTH)', + '..', ], 'conditions': [ ['pdf_enable_v8==1', { -- cgit v1.2.3