Fix append_fallback_font_families_for_locale.

tests/FontConfigParser.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkCommandLineFlags.h"
 #include "SkFontConfigParser_android.h"
@@ skipping 37 matching lines @@
             SkDebugf("  language %s\n", fontFamilies[i]->fLanguage.getTag().c_str());
         }
         for (int j = 0; j < fontFamilies[i]->fNames.count(); ++j) {
             SkDebugf("  name %s\n", fontFamilies[i]->fNames[j].c_str());
         }
         for (int j = 0; j < fontFamilies[i]->fFonts.count(); ++j) {
             const FontFileInfo& ffi = fontFamilies[i]->fFonts[j];
             SkDebugf("  file (%d) %s#%d\n", ffi.fWeight, ffi.fFileName.c_str(), ffi.fIndex);
         }
     }
+    SkDebugf("\n\n");
 }
 
 DEF_TEST(FontConfigParserAndroid, reporter) {
 
     bool resourcesMissing = false;
 
     SkTDArray<FontFamily*> preV17FontFamilies;
     SkFontConfigParser::GetCustomFontFamilies(preV17FontFamilies,
         SkString("/custom/font/path/"),
         GetResourcePath("android_fonts/pre_v17/system_fonts.xml").c_str(),
-        GetResourcePath("android_fonts/pre_v17/fallback_fonts.xml").c_str());
+        GetResourcePath("android_fonts/pre_v17/fallback_fonts.xml").c_str(),
+        NULL);
 
     if (preV17FontFamilies.count() > 0) {
         REPORTER_ASSERT(reporter, preV17FontFamilies.count() == 14);
         REPORTER_ASSERT(reporter, CountFallbacks(preV17FontFamilies) == 10);
 
         DumpLoadedFonts(preV17FontFamilies);
         ValidateLoadedFonts(preV17FontFamilies, "Roboto-Regular.ttf", reporter);
     } else {
         resourcesMissing = true;
     }
 
 
     SkTDArray<FontFamily*> v17FontFamilies;
     SkFontConfigParser::GetCustomFontFamilies(v17FontFamilies,
         SkString("/custom/font/path/"),
         GetResourcePath("android_fonts/v17/system_fonts.xml").c_str(),
-        GetResourcePath("android_fonts/v17/fallback_fonts.xml").c_str());
+        GetResourcePath("android_fonts/v17/fallback_fonts.xml").c_str(),
+        GetResourcePath("android_fonts/v17").c_str());
 
     if (v17FontFamilies.count() > 0) {
-        REPORTER_ASSERT(reporter, v17FontFamilies.count() == 41);
-        REPORTER_ASSERT(reporter, CountFallbacks(v17FontFamilies) == 31);
+        REPORTER_ASSERT(reporter, v17FontFamilies.count() == 56);
+        REPORTER_ASSERT(reporter, CountFallbacks(v17FontFamilies) == 46);
 
         DumpLoadedFonts(v17FontFamilies);
         ValidateLoadedFonts(v17FontFamilies, "Roboto-Regular.ttf", reporter);
     } else {
         resourcesMissing = true;
     }
 
 
     SkTDArray<FontFamily*> v22FontFamilies;
     SkFontConfigParser::GetCustomFontFamilies(v22FontFamilies,
         SkString("/custom/font/path/"),
         GetResourcePath("android_fonts/v22/fonts.xml").c_str(),
+        NULL,
         NULL);
 
     if (v22FontFamilies.count() > 0) {
         REPORTER_ASSERT(reporter, v22FontFamilies.count() == 53);
         REPORTER_ASSERT(reporter, CountFallbacks(v22FontFamilies) == 42);
 
         DumpLoadedFonts(v22FontFamilies);
         ValidateLoadedFonts(v22FontFamilies, "Roboto-Thin.ttf", reporter);
     } else {
         resourcesMissing = true;
     }
 
     if (resourcesMissing) {
         SkDebugf("---- Resource files missing for FontConfigParser test\n");
     }
 }