Bug 740138 - [Skia] Use SkDebug_android for Android instead of SkDebug_stdio. r=mattwoodrow
authorGeorge Wright <gwright@mozilla.com>
Wed, 28 Mar 2012 18:27:01 -0400
changeset 93887 5f280b4ff6f840d28ad411e51ec0a38daea75c24
parent 93886 16d5e6f8ed89a97fb83fb30514a8ce5e9a9b834c
child 93888 732633ac1e07036c6e3dce6eceba4dac9210c76a
push idunknown
push userunknown
push dateunknown
reviewersmattwoodrow
bugs740138
milestone14.0a1
Bug 740138 - [Skia] Use SkDebug_android for Android instead of SkDebug_stdio. r=mattwoodrow
gfx/skia/Makefile.in
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -277,17 +277,16 @@ CPPSRCS = \
 	SkStrokerPriv.cpp \
 	SkTSearch.cpp \
 	SkTypeface.cpp \
 	SkTypefaceCache.cpp \
 	SkUnPreMultiply.cpp \
 	SkUtils.cpp \
 	SkWriter32.cpp \
 	SkXfermode.cpp \
-	SkDebug_stdio.cpp \
 	SkGlobals_global.cpp \
 	SkOSFile_stdio.cpp \
 	SkThread_none.cpp \
 	SkGradientShader.cpp \
 	SkBitmapCache.cpp \
 	SkBlurDrawLooper.cpp \
 	SkBlurMaskFilter.cpp \
 	SkBlurMask.cpp \
@@ -304,25 +303,30 @@ EXPORTS_skia += \
 CPPSRCS += \
 	SkFontHost_mac_coretext.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 endif
 
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
+	SkDebug_android.cpp \
 	SkFontHost_FreeType.cpp \
 	SkFontHost_android.cpp \
 	SkFontHost_gamma.cpp \
 	SkMMapStream.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
 
 DEFINES += -DSK_BUILD_FOR_ANDROID_NDK
 OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
+else
+CPPSRCS += \
+	SkDebug_stdio.cpp \
+	$(NULL)
 endif
 
 ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += \
 	SkFontHost_FreeType.cpp \
 	SkFontHost_gamma_none.cpp \
 	SkFontHost_linux.cpp \
 	SkTime_Unix.cpp \