aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontMgr_android_parser.cpp
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2016-01-14 12:23:54 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-14 12:23:55 -0800
commit576c206d29b9de406e7faf6a93c416290b2c08b5 (patch)
tree97e99f05ef7e7886fa6db5bbf065242c8d409536 /src/ports/SkFontMgr_android_parser.cpp
parent8afddabeaf5084e09d66a99b80ed2c72fa338e59 (diff)
Update tests to produce more sensible output for Android framework builds.
Diffstat (limited to 'src/ports/SkFontMgr_android_parser.cpp')
-rw-r--r--src/ports/SkFontMgr_android_parser.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp
index 29ea52523d..1d1a3b7ddb 100644
--- a/src/ports/SkFontMgr_android_parser.cpp
+++ b/src/ports/SkFontMgr_android_parser.cpp
@@ -663,11 +663,6 @@ static void append_fallback_font_families_for_locale(SkTDArray<FontFamily*>& fal
const char* dir,
const SkString& basePath)
{
-#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
- // The framework is beyond Android 4.2 and can therefore skip this function
- return;
-#endif
-
SkAutoTCallIProc<DIR, closedir> fontDirectory(opendir(dir));
if (nullptr == fontDirectory) {
return;