[PATCH 4/9] Bug 751418 - Ensure we define USE_SKIA globally r=ted
authorGeorge Wright <gw@gwright.org.uk>
Tue, 26 Feb 2013 18:29:33 -0500
changeset 123896 0b484520fcf6cf7fec94ff8f0bafc1942c266b08
parent 123895 44ed902f0843190c7d661450452aa5066b949bee
child 123897 9441307a79def37f080d5baf87e485cf6bee7c0f
push id24401
push useremorley@mozilla.com
push dateWed, 06 Mar 2013 16:09:28 +0000
treeherdermozilla-central@635f2c7660c8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs751418
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
[PATCH 4/9] Bug 751418 - Ensure we define USE_SKIA globally r=ted From f0e2d2aa3f9a5738369ce9e0e8cd00d937ac77ab Mon Sep 17 00:00:00 2001 --- configure.in | 4 ++++ gfx/2d/Makefile.in | 7 ------- gfx/skia/Makefile.in | 3 --- 3 files changed, 4 insertions(+), 10 deletions(-)
configure.in
gfx/2d/Makefile.in
gfx/skia/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -8270,16 +8270,20 @@ MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB
 AC_SUBST(MOZ_OTS_LIBS)
 
 dnl ========================================================
 dnl Skia 
 dnl ========================================================
 if test "$MOZ_ENABLE_SKIA"; then
   MOZ_SKIA_LIBS='$(DEPTH)/gfx/skia/$(LIB_PREFIX)skia.$(LIB_SUFFIX)'
   AC_DEFINE(MOZ_ENABLE_SKIA)
+  AC_DEFINE(USE_SKIA)
+  if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
+    AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
+  fi
 else
   MOZ_SKIA_LIBS=
 fi
 AC_SUBST(MOZ_ENABLE_SKIA)
 AC_SUBST(MOZ_SKIA_LIBS)
 
 dnl ========================================================
 dnl disable xul
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -83,19 +83,16 @@ DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D
 ifdef MOZ_ENABLE_SKIA
 CPPSRCS	+= \
         SourceSurfaceSkia.cpp \
         DrawTargetSkia.cpp \
         PathSkia.cpp \
         convolver.cpp \
         image_operations.cpp \
         $(NULL)
-
-DEFINES += -DUSE_SKIA
-
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifdef MOZ_ENABLE_SKIA
 CPPSRCS += \
         ScaledFontMac.cpp \
         $(NULL)
 
@@ -104,20 +101,16 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gonk qt))
 CPPSRCS	+= \
         ScaledFontFreetype.cpp \
         $(NULL)
 DEFINES += -DMOZ_ENABLE_FREETYPE
 endif
 
-ifeq (android,$(MOZ_WIDGET_TOOLKIT))
-DEFINES += -DSK_BUILD_FOR_ANDROID_NDK
-endif
-
 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0
 
 ifdef MOZ_DEBUG
 DEFINES += -DGFX_LOG_DEBUG -DGFX_LOG_WARNING
 endif
 
 # Are we targeting x86 or x64?  If so, build SSE2 files.
 ifneq (,$(INTEL_ARCHITECTURE))
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -193,18 +193,16 @@ EXPORTS_skia = \
 	include/gpu/gl/SkGLContext.h \
 	include/gpu/gl/SkMesaGLContext.h \
 	include/gpu/gl/SkNativeGLContext.h \
 	include/gpu/gl/SkNullGLContext.h \
 	include/utils/SkDeferredCanvas.h \
 	include/views/SkTextBox.h \
 	$(NULL)
 
-DEFINES += -DUSE_SKIA
-
 GPU_CPPSRCS = \
 	GrAAConvexPathRenderer.cpp \
 	GrAAHairLinePathRenderer.cpp \
 	GrAARectRenderer.cpp \
 	GrAddPathRenderers_default.cpp \
 	GrAllocPool.cpp \
 	GrAtlas.cpp \
 	GrBufferAllocPool.cpp \
@@ -453,17 +451,16 @@ CPPSRCS += \
 	SkFontHost_FreeType.cpp \
 	SkFontHost_FreeType_common.cpp \
 	SkFontHost_tables.cpp \
 	SkMMapStream.cpp \
 	SkTime_Unix.cpp \
 	SkThread_pthread.cpp \
 	$(NULL)
 
-DEFINES += -DSK_BUILD_FOR_ANDROID_NDK
 OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
 else
 CPPSRCS += \
 	SkDebug_stdio.cpp \
 	SkThread_none.cpp \
 	$(NULL)
 endif