Merge to XFA: Fix all relative includes to third_party.

pdfium.gyp

+# 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
     #'chromium_code': 1,
     'pdf_use_skia%': 0,
     'pdf_enable_v8%': 1,
     'pdf_enable_xfa%': 1,
     'conditions': [
       ['OS=="linux"', {
         'bundle_freetype%': 0,
       }, {  # On Android there's no system FreeType. On Windows and Mac, only a
             # few methods are used from it.
         'bundle_freetype%': 1,
       }],
     ],
   },
   'target_defaults': {
     'defines' : [
       'OPJ_STATIC',
       'PNG_PREFIX',
       'PNGPREFIX_H',
       'PNG_USE_READ_MACROS',
       'V8_DEPRECATION_WARNINGS',
       '_CRT_SECURE_NO_WARNINGS',
     ],
     'include_dirs': [
+      # This is implicit in GN.
+      '<(DEPTH)',
+      '.',
       'third_party/freetype/include',
       'third_party/freetype/include/freetype',
     ],
     'conditions': [
       ['pdf_use_skia==1', {
         'defines': ['_SKIA_SUPPORT_'],
       }],
       ['pdf_enable_v8==1', {
         'defines': ['PDF_ENABLE_V8'],
       }],
@@ skipping 290 matching lines @@
         'core/src/fpdftext/txtproc.h',
         'core/src/fpdftext/unicodenormalization.cpp',
         'core/src/fpdftext/unicodenormalizationdata.cpp',
         'core/src/fpdftext/unicodenormalizationdata.h',
       ],
     },
     {
       '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',
         'third_party/third_party.gyp:fx_zlib',
       ],
       'sources': [
         'core/include/fxcodec/fx_codec.h',
         'core/include/fxcodec/fx_codec_def.h',
         'core/include/fxcodec/fx_codec_flate.h',
         'core/src/fxcodec/codec/codec_int.h',
@@ skipping 401 matching lines @@
     },
     {
       'target_name': 'pdfium_unittests',
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest_main',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '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',
         'core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp',
         'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp',
         'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp',
         'core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp',
         'core/src/fxcrt/fx_basic_bstring_unittest.cpp',
         'core/src/fxcrt/fx_basic_memmgr_unittest.cpp',
         'core/src/fxcrt/fx_basic_wstring_unittest.cpp',
@@ skipping 14 matching lines @@
     },
     {
       'target_name': 'pdfium_embeddertests',
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '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',
         'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp',
         'core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp',
         'fpdfsdk/src/fpdf_dataavail_embeddertest.cpp',
         'fpdfsdk/src/fpdfdoc_embeddertest.cpp',
         'fpdfsdk/src/fpdfformfill_embeddertest.cpp',
         'fpdfsdk/src/fpdftext_embeddertest.cpp',
         'fpdfsdk/src/fpdfview_c_api_test.c',
@@ skipping 21 matching lines @@
         }],
       ],
     },
     {
       'target_name': 'test_support',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
-      'include_dirs': [
-        '<(DEPTH)',
-      ],
       'sources': [
         'testing/fx_string_testhelpers.cpp',
         'testing/fx_string_testhelpers.h',
         'testing/test_support.cpp',
         'testing/test_support.h',
       ],
       'conditions': [
         ['pdf_enable_v8==1', {
           'include_dirs': [
             '<(DEPTH)/v8',
             '<(DEPTH)/v8/include',
           ],
           'dependencies': [
             '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
             '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform',
           ],
         }],
       ],
     },
   ],
 }