diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-06 14:38:48 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-06 14:38:48 -0800 |
| commit | 8241df7edc53b8777e7f71ff379fa53f368c3a28 (patch) | |
| tree | 418c3950809d05c00fad9a39a30e1d324e68cb8b /pdfium.gyp | |
| parent | de383c5d8c0b418a5d5b55d5a4ead715e69255c5 (diff) | |
| download | pdfium-8241df7edc53b8777e7f71ff379fa53f368c3a28.tar.xz | |
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 .
Diffstat (limited to 'pdfium.gyp')
| -rw-r--r-- | pdfium.gyp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index 23698d7846..df1b99c340 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 @@ -24,6 +28,9 @@ '_CRT_SECURE_NO_WARNINGS', ], 'include_dirs': [ + # This is implicit in GN. + '<(DEPTH)', + '.', 'third_party/freetype/include', 'third_party/freetype/include/freetype', ], @@ -334,8 +341,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_lpng', 'third_party/third_party.gyp:fx_tiff', @@ -757,9 +764,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', @@ -794,9 +798,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', @@ -838,9 +839,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', |