summaryrefslogtreecommitdiff
path: root/third_party/third_party.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 /third_party/third_party.gyp
parentba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff)
downloadpdfium-34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c.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 'third_party/third_party.gyp')
-rw-r--r--third_party/third_party.gyp7
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 43e1093fc3..78aa6fc657 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -8,6 +8,11 @@
'OPJ_STATIC',
'_CRT_SECURE_NO_WARNINGS',
],
+ 'include_dirs': [
+ # This is implicit in GN.
+ '<(DEPTH)',
+ '..',
+ ],
'msvs_disabled_warnings': [
4005, 4018, 4146, 4333, 4345, 4267
],
@@ -161,7 +166,7 @@
},
},
{
- 'target_name': 'fx_libjpeg',
+ 'target_name': 'libjpeg',
'type': 'static_library',
'sources': [
'libjpeg/cderror.h',