diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-16 05:05:19 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-16 05:05:19 +0000 |
| commit | 312c58b439e9a4dbeb43b10af7f2174ebe14076e (patch) | |
| tree | d5a6ee0aeb24cec5204deed8672806e0a578c5ef /content | |
| parent | dd48d4986248485439b2dc3d0803cc314f2d0c0e (diff) | |
| download | chromium_src-312c58b439e9a4dbeb43b10af7f2174ebe14076e.zip chromium_src-312c58b439e9a4dbeb43b10af7f2174ebe14076e.tar.gz chromium_src-312c58b439e9a4dbeb43b10af7f2174ebe14076e.tar.bz2 | |
Declare dependency on blink_headers in targets that use blink headers
This updates targets that use blink public API headers to depend on the
blink_headers target, which sets up include paths so the headers can function
without needing relative path hacks. Targets that expose #includes of public
blink headers export the dependent settings from blink_headers to their
dependents.
BUG=350097
Review URL: https://codereview.chromium.org/189713002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content.gyp | 7 | ||||
| -rw-r--r-- | content/content_browser.gypi | 5 | ||||
| -rw-r--r-- | content/content_common.gypi | 5 | ||||
| -rw-r--r-- | content/content_ppapi_plugin.gypi | 1 | ||||
| -rw-r--r-- | content/content_tests.gypi | 1 |
5 files changed, 19 insertions, 0 deletions
diff --git a/content/content.gyp b/content/content.gyp index 6098fe1..8aa3bfb 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -143,6 +143,9 @@ 'dependencies': [ 'content_common', ], + 'export_dependent_settings': [ + 'content_common', + ], }, { 'target_name': 'content_browser', @@ -337,11 +340,13 @@ 'target_name': 'content_app_both', 'type': 'none', 'dependencies': ['content'], + 'export_dependent_settings': ['content'], }, { 'target_name': 'content_browser', 'type': 'none', 'dependencies': ['content'], + 'export_dependent_settings': ['content'], }, { 'target_name': 'content_common', @@ -349,6 +354,7 @@ 'dependencies': ['content', 'content_resources.gyp:content_resources'], # Disable c4267 warnings until we fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], + 'export_dependent_settings': ['content'], }, { 'target_name': 'content_child', @@ -381,6 +387,7 @@ 'target_name': 'content_utility', 'type': 'none', 'dependencies': ['content'], + 'export_dependent_settings': ['content'], }, { 'target_name': 'content_worker', diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 4e943fc..74f931b 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -13,6 +13,7 @@ '../third_party/re2/re2.gyp:re2', '../third_party/zlib/google/zip.gyp:zip', '../third_party/zlib/zlib.gyp:zlib', + '../third_party/WebKit/public/blink_headers.gyp:blink_headers', '../ui/accessibility/accessibility.gyp:accessibility', '../ui/accessibility/accessibility.gyp:ax_gen', '../ui/base/ui_base.gyp:ui_base', @@ -26,6 +27,10 @@ ], 'export_dependent_settings': [ '../ui/accessibility/accessibility.gyp:ax_gen', + # The public content API headers directly include Blink API headers, so we + # have to export the blink header settings so that relative paths in these + # headers resolve correctly. + '../third_party/WebKit/public/blink_headers.gyp:blink_headers', ], 'include_dirs': [ '..', diff --git a/content/content_common.gypi b/content/content_common.gypi index 8e46bb5..9e0a8d6 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -8,6 +8,7 @@ '../components/tracing.gyp:tracing', '../net/net.gyp:net', '../skia/skia.gyp:skia', + '../third_party/WebKit/public/blink_headers.gyp:blink_headers', '../third_party/icu/icu.gyp:icuuc', '../third_party/libjingle/libjingle.gyp:libjingle', '../ui/accessibility/accessibility.gyp:accessibility', @@ -22,6 +23,10 @@ ], 'export_dependent_settings': [ '../base/base.gyp:base', + # The public content API headers directly include Blink API headers, so we + # have to export the blink header settings so that relative paths in these + # headers resolve correctly. + '../third_party/WebKit/public/blink_headers.gyp:blink_headers', ], 'sources': [ 'public/common/assert_matching_enums.cc', diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi index 55a77f3..578ffd0 100644 --- a/content/content_ppapi_plugin.gypi +++ b/content/content_ppapi_plugin.gypi @@ -11,6 +11,7 @@ '../ui/base/ui_base.gyp:ui_base', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', + '../third_party/WebKit/public/blink.gyp:blink', ], 'sources': [ 'ppapi_plugin/broker_process_dispatcher.cc', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index d1154bf..2a61607 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -901,6 +901,7 @@ 'type': 'static_library', 'dependencies': [ 'content_shell_lib', + 'content.gyp:content_browser', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../ui/accessibility/accessibility.gyp:ax_gen', |