Bug 716415 - Follow to include changes that I forgot to qref. r=bustage

gfx/skia/Makefile.in

@@ -308,10 +308,7 @@ endif
 
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
-	SkFontHost_FreeType.cpp \
-	SkFontHost_android.cpp \
-	SkFontHost_gamma.cpp \
-	FontHostConfiguration_android.cpp \
+	SkFontHost_none.cpp \
 	SkMMapStream.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)

gfx/skia/src/ports/FontHostConfiguration_android.cpp

@@ -16,7 +16,6 @@
 */
 
 #include "FontHostConfiguration_android.h"
-#include <expat_config.h>
 #include <expat.h>
 #include "SkTDArray.h"
 

gfx/skia/src/ports/SkFontHost_none.cpp

@@ -30,7 +30,8 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(char const*) {
 // static
 SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
         uint32_t fontID,
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo) {
+        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+        const uint32_t*, uint32_t) {
     SkDEBUGFAIL("SkFontHost::GetAdvancedTypefaceMetrics unimplemented");
     return NULL;
 }