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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: skia/skia_common.gypi

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « skia/BUILD.gn ('k') | skia/skia_library.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia_common.gypi
diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi
index 6137352d2668b5646e48ee2c0cffd55d49250898..ff4207402a9b171a01890d8b1305d8439fe1bc9d 100644
--- a/skia/skia_common.gypi
+++ b/skia/skia_common.gypi
@@ -6,6 +6,9 @@
# Skia build.
{
'includes': [
+ # blink_skia_config.gypi defines blink_skia_defines
+ '../third_party/WebKit/public/blink_skia_config.gypi',
+
# skia_for_chromium_defines.gypi defines skia_for_chromium_defines
'../third_party/skia/gyp/skia_for_chromium_defines.gypi',
],
@@ -156,6 +159,10 @@
'GR_GL_IGNORE_ES3_MSAA=0',
'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT',
+ # This variable contains additional defines, specified in blink's
+ # blink_skia_config.gypi file.
+ '<@(blink_skia_defines)',
+
# This variable contains additional defines, specified in skia's
# skia_for_chromium_defines.gypi file.
'<@(skia_for_chromium_defines)',
« no previous file with comments | « skia/BUILD.gn ('k') | skia/skia_library.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698