diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 15:28:08 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 15:28:08 +0000 |
| commit | e80f4beb8a11294f88d4d03604912215f15098bc (patch) | |
| tree | 34bad06bce9795d416aa068080cc8bd6e21fc2f3 /build/shim_headers.gypi | |
| parent | ee59cbecde3b8b22c15609f51528173482a819df (diff) | |
| download | chromium_src-e80f4beb8a11294f88d4d03604912215f15098bc.zip chromium_src-e80f4beb8a11294f88d4d03604912215f15098bc.tar.gz chromium_src-e80f4beb8a11294f88d4d03604912215f15098bc.tar.bz2 | |
Android WebView: build fixes for use_system_skia.
The skia shim headers were not being included at the front of the path
because of a gyp processing issue, causing it to pick up the bundled
headers instead by mistake; fix the gyp file.
Also, some of the chromium code depends on non-public headers; add the
required include path for this to work until we can fix the code.
BUG=263818,274425
Review URL: https://chromiumcodereview.appspot.com/23064007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/shim_headers.gypi')
| -rw-r--r-- | build/shim_headers.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/shim_headers.gypi b/build/shim_headers.gypi index 4291468..997a4d0 100644 --- a/build/shim_headers.gypi +++ b/build/shim_headers.gypi @@ -17,12 +17,19 @@ '<(shim_headers_path)', ], 'all_dependent_settings': { + # Repeating this with different numbers of plusses is unfortunately required + # to make sure that even if this include is inside nested conditions/etc, it + # still gets inserted at the beginning of the include_dirs list. See + # http://crbug.com/263818 for details. 'include_dirs+++': [ '<(shim_headers_path)', ], 'include_dirs++++': [ '<(shim_headers_path)', ], + 'include_dirs+++++': [ + '<(shim_headers_path)', + ], }, 'actions': [ { |