Additional cleanups to Android config parsing.

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 "SkFontConfigParser_android.h"
 #include "Test.h"
@@ skipping 19 matching lines @@
 
 void DumpLoadedFonts(SkTDArray<FontFamily*> fontFamilies) {
 #if SK_DEBUG_FONTS
     for (int i = 0; i < fontFamilies.count(); ++i) {
         SkDebugf("Family %d:\n", i);
         switch(fontFamilies[i]->fVariant) {
             case kElegant_FontVariant: SkDebugf("  elegant\n"); break;
             case kCompact_FontVariant: SkDebugf("  compact\n"); break;
             default: break;
         }
-        if (fontFamilies[i]->fBasePath) {
-            SkDebugf("  basePath %s\n", fontFamilies[i]->fBasePath);
-        }
+        SkDebugf("  basePath %s\n", fontFamilies[i]->fBasePath.c_str());

[scroggo, 2015/02/10 13:59:41]

I'm guessing this bit-rotted due to SK_DEBUG_FONTS not being defined? Should we
define it for some builder?

[bungeman-skia, 2015/02/10 15:34:12]

I think it might be more due to the fact that I didn't add this change to my
previous CL. We should re-work this to avoid bit rot, for sure. I already have a
'--verboseFontMgr' flag which should work with this, with the benefit of
removing these 'ifdefs' and avoiding the dreaded random 'unreachable code'
warnings.

         if (!fontFamilies[i]->fLanguage.getTag().isEmpty()) {
             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);
         }
@@ skipping 53 matching lines @@
         ValidateLoadedFonts(v22FontFamilies, "Roboto-Thin.ttf", reporter);
     } else {
         resourcesMissing = true;
     }
 
     if (resourcesMissing) {
         SkDebugf("---- Resource files missing for FontConfigParser test\n");
     }
 }