projects / platform / upstream / libSkiaSharp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8f3cc77)
More removal of duplicate framework defines.
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Mon, 14 Apr 2014 14:53:58 +0000 (14:53 +0000)
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Mon, 14 Apr 2014 14:53:58 +0000 (14:53 +0000)
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@14174 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/common_conditions.gypi patch | blob | history

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 57de09a7adf24b8793be45c39c193e29900d9ac3..9f77c7d484dc105a8ba5380c5d06b8e56751d451 100644 (file)
--- a/gyp/common_conditions.gypi
+++ b/gyp/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.
Domain: Dotnet / API;