diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index b36ac2b57f..91b76bc2d1 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -49,7 +49,7 @@ ifeq ($(PERF_TEST), 1)
 LOCAL_CFLAGS += -DPERF_TEST
 endif
 
-LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
+LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -DHAVE_FREETYPE
 
 LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl
 LOCAL_C_INCLUDES += $(LIBXML_PATH)
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index a653be692c..a590621180 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -198,9 +198,14 @@ FONTS
 
 #if defined(HAVE_OPENGL) || defined(HAVE_D3D8) || defined(HAVE_D3D9)
 
-#if defined(HAVE_FREETYPE)
+#ifdef HAVE_FREETYPE
 #include "../../gfx/fonts/freetype.c"
+#endif
+
+#if defined(HAVE_FREETYPE) && !defined(ANDROID)
 #include "../../gfx/fonts/fonts.c"
+#elif defined(HAVE_FREETYPE) && defined(ANDROID)
+#include "../../gfx/fonts/bitmapfont.c"
 #elif defined(HAVE_LIBDBGFONT)
 #include "../../gfx/fonts/ps_libdbgfont.c"
 #elif defined(_XBOX1)