Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Unified Diff: skia/skia_system.gypi

Issue 23064007: Android WebView: build fixes for use_system_skia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/shim_headers.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia_system.gypi
diff --git a/skia/skia_system.gypi b/skia/skia_system.gypi
index b05623c0500b1d69faf319ca4c7492cc03fa1118..a26bdc0615acaa5c67df913bb6ca206e3488b7d7 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.
« no previous file with comments | « build/shim_headers.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698