Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Unified Diff: src/ports/SkFontMgr_android_parser.cpp

Issue 1590023002: Update tests to produce more sensible output for Android framework builds. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: cleanup Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/KtxTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontMgr_android_parser.cpp
diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp
index 29ea52523dc25d4e9d2ef6a434369409c7a450dc..1d1a3b7ddb67236b8f3c9d2e76e29bc625c8f5aa 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;
« no previous file with comments | « no previous file | tests/KtxTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698