summaryrefslogtreecommitdiff
path: root/samples/samples.gyp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-11-05 18:39:40 -0800
committerLei Zhang <thestig@chromium.org>2015-11-05 18:39:40 -0800
commit34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c (patch)
tree422e979cbfdeab9781c07a4040aee94a9dd0a7f6 /samples/samples.gyp
parentba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff)
downloadpdfium-chromium/2559.tar.xz
Fix all relative includes to third_party.chromium/2560chromium/2559chromium/2558chromium/2557
- In non-standalone builds, use the provided jpeg library. - Run gn format over all the GN files. - Also roll DEPS for buildtools to c2f2598. BUG=541704 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1425153006 .
Diffstat (limited to 'samples/samples.gyp')
-rw-r--r--samples/samples.gyp5
1 files changed, 2 insertions, 3 deletions
diff --git a/samples/samples.gyp b/samples/samples.gyp
index 35b62b7fcf..3dc9a45cae 100644
--- a/samples/samples.gyp
+++ b/samples/samples.gyp
@@ -13,7 +13,9 @@
'PNG_USE_READ_MACROS',
],
'include_dirs': [
+ # This is implicit in GN.
'<(DEPTH)',
+ '..',
],
'conditions': [
['pdf_enable_v8==1', {
@@ -66,9 +68,6 @@
'../pdfium.gyp:pdfium',
'../third_party/third_party.gyp:pdfium_base',
],
- 'include_dirs': [
- '../../',
- ],
'sources': [
'image_diff.cc',
'image_diff_png.h',