diff options
| -rw-r--r-- | build/shim_headers.gypi | 7 | ||||
| -rw-r--r-- | skia/skia_system.gypi | 7 |
2 files changed, 14 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': [ { diff --git a/skia/skia_system.gypi b/skia/skia_system.gypi index b05623c..a26bdc0 100644 --- a/skia/skia_system.gypi +++ b/skia/skia_system.gypi @@ -9,6 +9,13 @@ 'direct_dependent_settings': { # This makes the Android build system set the include path appropriately. 'libraries': [ '-lskia' ], + # Some Chrome code uses non-public header files (http://crbug.com/274425), + # so we need to add this include path for now to make it build. The system + # version of skia is already required to be the same as the chromium version + # so using the bundled headers shouldn't break anything. + 'include_dirs': [ + '../third_party/skia/src/core', + ], }, 'link_settings': { # This actually causes the final binary to be linked against skia. |