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

Unified Diff: skia/skia_common.gypi

Issue 180083002: defer to skia_for_chromium_defines.gypi for temporary guard defines (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | « no previous file | no next file » | 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 600b4822005418a00c0584222d39bda9d062a21e..1459627337965d167345d624ac46f352ca356f37 100644
--- a/skia/skia_common.gypi
+++ b/skia/skia_common.gypi
@@ -5,6 +5,11 @@
# This gypi file handles the removal of platform-specific files from the
# Skia build.
{
+ 'includes': [
+ # skia_for_chromium_defines.gypi defines skia_for_chromium_defines
+ '../third_party/skia/gyp/skia_for_chromium_defines.gypi',
+ ],
+
'include_dirs': [
'..',
'config',
@@ -147,12 +152,12 @@
'SK_ENABLE_LEGACY_API_ALIASING=1',
'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
'GR_GL_IGNORE_ES3_MSAA=0',
- 'SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1',
- 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1',
'SK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1',
'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT',
- 'SK_SUPPORT_LEGACY_COPYTO_CONFIG',
- 'SK_SUPPORT_DEEPCOPYTO_CONFIG',
+
+ # This variable contains additional defines, specified in skia's
+ # skia_for_chromium_defines.gypi file.
+ '<@(skia_for_chromium_defines)',
],
'default_font_cache_limit%': '(20*1024*1024)',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698