summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-14 14:53:58 +0000
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-14 14:53:58 +0000
commita9f247e809fd63f290e17eefd6f1d920540763fa (patch)
treeaf6bf26e50da3ffca7f78105f603ea69f6391c7b
parent6c0565edbfc116de56384c81ed05db62ae54ccd1 (diff)
downloadgyp-a9f247e809fd63f290e17eefd6f1d920540763fa.tar.gz
More removal of duplicate framework defines.
BUG=skia:1975 R=djsollen@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/228343003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14174 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--common_conditions.gypi4
1 files changed, 0 insertions, 4 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi
index 57de09a..9f77c7d 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -274,10 +274,6 @@
# using freetype's embolden allows us to adjust fake bold settings at
# draw-time, at which point we know which SkTypeface is being drawn
'SK_USE_FREETYPE_EMBOLDEN',
- # Android provides at least FreeType 2.4.0 at runtime.
- 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400',
- # Skia should not use dlopen on Android.
- 'SK_CAN_USE_DLOPEN 0',
'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
# When built as part of the system image we can enable certian non-NDK
# compliant optimizations.