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/image_diff.cc | 4 ++-- samples/image_diff_png.cc | 6 +++--- samples/pdfium_test.cc | 2 +- samples/samples.gyp | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'samples') diff --git a/samples/image_diff.cc b/samples/image_diff.cc index f10bd31085..88a3956d09 100644 --- a/samples/image_diff.cc +++ b/samples/image_diff.cc @@ -19,9 +19,9 @@ #include #include -#include "../third_party/base/logging.h" -#include "../third_party/base/numerics/safe_conversions.h" #include "image_diff_png.h" +#include "third_party/base/logging.h" +#include "third_party/base/numerics/safe_conversions.h" #if defined(OS_WIN) #include diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc index a8ca925a3a..992617d5e5 100644 --- a/samples/image_diff_png.cc +++ b/samples/image_diff_png.cc @@ -16,9 +16,9 @@ #include -#include "../third_party/base/logging.h" -#include "../third_party/lpng_v163/png.h" -#include "../third_party/zlib_v128/zlib.h" +#include "third_party/base/logging.h" +#include "third_party/lpng_v163/png.h" +#include "third_party/zlib_v128/zlib.h" namespace image_diff_png { diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index 4ccf1a7721..190286a34e 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -25,7 +25,7 @@ #ifdef PDF_ENABLE_V8 #include "v8/include/libplatform/libplatform.h" #include "v8/include/v8.h" -#endif +#endif // PDF_ENABLE_V8 #ifdef _WIN32 #define snprintf _snprintf 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