From 059a4c70d7eb6556c123e529259aaffe7214164d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 13 Mar 2013 12:48:26 +0000 Subject: refactor android defines to implicitly assume NDK compliance unless it is explicitly marked as being specific to the android framework. Author: djsollen@google.com Reviewed By: reed@google.com,borenet@google.com Review URL: https://chromiumcodereview.appspot.com/12739007 git-svn-id: http://skia.googlecode.com/svn/trunk@8124 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkFontHost_android.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ports') diff --git a/src/ports/SkFontHost_android.cpp b/src/ports/SkFontHost_android.cpp index bbde313ab6..e1d6cf471e 100644 --- a/src/ports/SkFontHost_android.cpp +++ b/src/ports/SkFontHost_android.cpp @@ -885,7 +885,7 @@ size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length, } SkFontID SkFontHost::NextLogicalFont(SkFontID currFontID, SkFontID origFontID) { -#ifdef SK_BUILD_FOR_ANDROID_NDK +#if defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) // Skia does not support font fallback for ndk applications in order to // enable clients such as WebKit to customize their font selection. // Clients can use GetFallbackFamilyNameForChar() to get the fallback -- cgit v1.2.3