Use a NDK-compliant way of reading locale.

Remove !SK_BUILD_FOR_ANDROID_NDK from locale-related code

git-svn-id: http://skia.googlecode.com/svn/trunk@3899 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 7 insertions, 18 deletions

diff --git a/src/ports/SkFontHost_android.cpp b/src/ports/SkFontHost_android.cpp
index df240ab44b..0d8ebd31be 100644
--- a/src/ports/SkFontHost_android.cpp
+++ b/src/ports/SkFontHost_android.cpp
@@ -705,32 +705,21 @@ static void reload_fallback_fonts() {
 }
 
 static void load_system_fonts() {
-#if !defined(SK_BUILD_FOR_ANDROID_NDK)
-    static char prevLanguage[3];
-    static char prevRegion[3];
-    char language[3] = "";
-    char region[3] = "";
+    static AndroidLocale prevLocale;
+    AndroidLocale locale;
 
-    getLocale(language, region);
+    getLocale(locale);
 
     if (!gDefaultNormal) {
-        strncpy(prevLanguage, language, 2);
-        strncpy(prevRegion, region, 2);
+        prevLocale = locale;
         init_system_fonts();
-    } else if (strncmp(language, prevLanguage, 2) || strncmp(region, prevRegion, 2)) {
-        strncpy(prevLanguage, language, 2);
-        strncpy(prevRegion, region, 2);
+    } else if (strncmp(locale.language, prevLocale.language, 2) ||
+            strncmp(locale.region, prevLocale.region, 2)) {
+        prevLocale = locale;
         reload_fallback_fonts();
     }
-#else
-    if (!gDefaultNormal) {
-        init_system_fonts();
-        reload_fallback_fonts();
-    }
-#endif
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkFontHost::Serialize(const SkTypeface* face, SkWStream* stream) {