summaryrefslogtreecommitdiff
path: root/pdfium.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 /pdfium.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 'pdfium.gyp')
-rw-r--r--pdfium.gyp18
1 files changed, 8 insertions, 10 deletions
diff --git a/pdfium.gyp b/pdfium.gyp
index af8cd5b6b4..5786accda8 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -1,3 +1,7 @@
+# Copyright 2015 PDFium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
{
'variables': {
# TODO(thakis): Enable this, pdfium:29
@@ -20,6 +24,9 @@
'_CRT_SECURE_NO_WARNINGS',
],
'include_dirs': [
+ # This is implicit in GN.
+ '<(DEPTH)',
+ '.',
'third_party/freetype/include',
'third_party/freetype/include/freetype',
],
@@ -327,8 +334,8 @@
'target_name': 'fxcodec',
'type': 'static_library',
'dependencies': [
+ '<(libjpeg_gyp_path):libjpeg',
'third_party/third_party.gyp:fx_lcms2',
- 'third_party/third_party.gyp:fx_libjpeg',
'third_party/third_party.gyp:fx_libopenjpeg',
'third_party/third_party.gyp:fx_zlib',
],
@@ -711,9 +718,6 @@
'pdfium',
'test_support',
],
- 'include_dirs': [
- '<(DEPTH)'
- ],
'sources': [
'core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp',
'core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp',
@@ -740,9 +744,6 @@
'pdfium',
'test_support',
],
- 'include_dirs': [
- '<(DEPTH)',
- ],
'sources': [
'core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp',
'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp',
@@ -783,9 +784,6 @@
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
- 'include_dirs': [
- '<(DEPTH)',
- ],
'sources': [
'testing/fx_string_testhelpers.cpp',
'testing/fx_string_testhelpers.h',