diff options
author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 11:52:26 +0000 |
---|---|---|
committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 11:52:26 +0000 |
commit | 7d94d759c8a86f691eeb134b808c5d9d944861e2 (patch) | |
tree | 6c637aa184499dd0cb14eb2bcee4803c72505653 /skia/skia.gyp | |
parent | 791c11d45f1c75420f4ec924b6917ae378ae7026 (diff) | |
download | chromium_src-7d94d759c8a86f691eeb134b808c5d9d944861e2.zip chromium_src-7d94d759c8a86f691eeb134b808c5d9d944861e2.tar.gz chromium_src-7d94d759c8a86f691eeb134b808c5d9d944861e2.tar.bz2 |
Remove "use_skia" variable from gyp.
We've now switched to Skia from CoreGraphics entirely. See
http://crbug.com/110881 for details.
This change removes the vestigal "use_skia" variable. I'll send follow-up
patches to remove uses of USE_SKIA from Chromium source.
BUG=110881
TBR=gene
Review URL: https://chromiumcodereview.appspot.com/12379030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
-rw-r--r-- | skia/skia.gyp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 25449ba..e6555b6 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -475,6 +475,8 @@ [ 'OS == "mac"', { 'defines': [ 'SK_BUILD_FOR_MAC', + 'SK_USE_MAC_CORE_TEXT', +# 'SK_USE_COLOR_LUMINANCE', ], 'include_dirs': [ '../third_party/skia/include/utils/mac', @@ -492,20 +494,6 @@ # so no need for these generic versions. '../third_party/skia/src/ports/SkFontHost_tables.cpp', ], - 'conditions': [ - [ 'use_skia == 0', { - 'sources/': [ - ['exclude', '/pdf/'], - ['exclude', 'ext/vector_platform_device_skia\\.(cc|h)'], - ], - }, - { # use_skia - 'defines': [ - 'SK_USE_MAC_CORE_TEXT', -# 'SK_USE_COLOR_LUMINANCE', - ], - }], - ], }], [ 'OS == "win"', { 'sources!': [ |