Update path to Android font config file

src/ports/SkFontConfigParser_android.cpp

 /*
  * Copyright 2011 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigParser_android.h"
 #include "SkTDArray.h"
 #include "SkTSearch.h"
 #include "SkTypeface.h"
 
 #include <expat.h>
 #include <dirent.h>
 #include <stdio.h>
 
 #include <limits>
 
-#define SYSTEM_FONTS_FILE "/system/etc/system_fonts.xml"
+
+
+// From Android version LMP onwards, all font files collapse into
+// /system/fonts/fonts.xml. Instead of trying to detect which version

[djsollen, 2014/08/13 13:31:53]

too late, but update this in a future CL to reflect the correct location.

+// we're on, try to open fonts.xml; if that fails, fall back to the
+// older filename.
+#define LMP_SYSTEM_FONTS_FILE "/system/etc/fonts.xml"
+#define OLD_SYSTEM_FONTS_FILE "/system/etc/system_fonts.xml"
 #define FALLBACK_FONTS_FILE "/system/etc/fallback_fonts.xml"
 #define VENDOR_FONTS_FILE "/vendor/etc/fallback_fonts.xml"
 
 #define LOCALE_FALLBACK_FONTS_SYSTEM_DIR "/system/etc"
 #define LOCALE_FALLBACK_FONTS_VENDOR_DIR "/vendor/etc"
 #define LOCALE_FALLBACK_FONTS_PREFIX "fallback_fonts-"
 #define LOCALE_FALLBACK_FONTS_SUFFIX ".xml"
 
 /**
  * This file contains TWO parsers: one for JB and earlier (system_fonts.xml /
@@ skipping 418 matching lines @@
         if (feof(file) != 0) {
             done = true;
         }
         XML_Parse(parser, buffer, len, done);
     }
     XML_ParserFree(parser);
     fclose(file);
 }
 
 static void getSystemFontFamilies(SkTDArray<FontFamily*> &fontFamilies) {
-    parseConfigFile(SYSTEM_FONTS_FILE, fontFamilies);
+    parseConfigFile(LMP_SYSTEM_FONTS_FILE, fontFamilies);
+
+    if (0 == fontFamilies.count()) {

[djsollen, 2014/08/13 13:31:52]

seems potentially wrong to trigger on that in case the caller doesn't provide an
empty fontFamlies array

+        parseConfigFile(OLD_SYSTEM_FONTS_FILE, fontFamilies);
+    }
 }
 
 /**
  * In some versions of Android prior to Android 4.2 (JellyBean MR1 at API
  * Level 17) the fallback fonts for certain locales were encoded in their own
  * XML files with a suffix that identified the locale.  We search the provided
  * directory for those files,add all of their entries to the fallback chain, and
  * include the locale as part of each entry.
  */
 static void getFallbackFontFamiliesForLocale(SkTDArray<FontFamily*> &fallbackFonts, const char* dir) {
@@ skipping 103 matching lines @@
     if (NULL != testFallbackConfigFile) {
         parseConfigFile(testFallbackConfigFile, fallbackFonts);
     }
 
     // Append all fallback fonts to system fonts
     for (int i = 0; i < fallbackFonts.count(); ++i) {
         fallbackFonts[i]->fIsFallbackFont = true;
         *fontFamilies.append() = fallbackFonts[i];
     }
 }