aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-03-14 11:20:24 -0400
committerDerek Sollenberger <djsollen@google.com>2011-03-14 16:33:36 -0400
commit05b6b4d746867a9fb02e14edfe1bf3685abeb813 (patch)
tree34b121f598d1693c014df48ee70bffa382b0cc23 /Android.mk
parent6210a7c68844602ee390bcce61dbb637910a3c6b (diff)
downloadexternal_skia-05b6b4d746867a9fb02e14edfe1bf3685abeb813.zip
external_skia-05b6b4d746867a9fb02e14edfe1bf3685abeb813.tar.gz
external_skia-05b6b4d746867a9fb02e14edfe1bf3685abeb813.tar.bz2
Skia Merge (revision 922)
Change-Id: I7ed57d10905d8bad6486a4d7410165eec1cc2b4f
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk74
1 files changed, 73 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index f2b86d4..72c3eba 100644
--- a/Android.mk
+++ b/Android.mk
@@ -123,6 +123,7 @@ LOCAL_SRC_FILES:= \
src/core/SkColorFilter.cpp \
src/core/SkColorTable.cpp \
src/core/SkComposeShader.cpp \
+ src/core/SkCubicClipper.cpp \
src/core/SkDeque.cpp \
src/core/SkDevice.cpp \
src/core/SkDither.cpp \
@@ -155,7 +156,6 @@ LOCAL_SRC_FILES:= \
src/core/SkPtrRecorder.cpp \
src/core/SkQuadClipper.cpp \
src/core/SkRasterizer.cpp \
- src/core/SkRefCnt.cpp \
src/core/SkRefDict.cpp \
src/core/SkRegion_path.cpp \
src/core/SkScalerContext.cpp \
@@ -183,6 +183,8 @@ LOCAL_SRC_FILES:= \
src/utils/SkLayer.cpp \
src/utils/SkMeshUtils.cpp \
src/utils/SkNinePatch.cpp \
+ src/utils/SkParse.cpp \
+ src/utils/SkParsePath.cpp \
src/utils/SkProxyCanvas.cpp
ifeq ($(TARGET_ARCH),arm)
@@ -238,6 +240,76 @@ LOCAL_MODULE:= libskia
include $(BUILD_SHARED_LIBRARY)
#############################################################
+# Build the skia gpu (ganesh) library
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+ifneq ($(ARCH_ARM_HAVE_VFP),true)
+ LOCAL_CFLAGS += -DSK_SOFTWARE_FLOAT
+endif
+
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+ LOCAL_CFLAGS += -D__ARM_HAVE_NEON
+endif
+
+LOCAL_SRC_FILES:= \
+ gpu/src/GrAllocPool.cpp \
+ gpu/src/GrAtlas.cpp \
+ gpu/src/GrClip.cpp \
+ gpu/src/GrContext.cpp \
+ gpu/src/GrDrawTarget.cpp \
+ gpu/src/GrGLIndexBuffer.cpp \
+ gpu/src/GrGLTexture.cpp \
+ gpu/src/GrGLVertexBuffer.cpp \
+ gpu/src/GrGpu.cpp \
+ gpu/src/GrGpuGLShaders2.cpp \
+ gpu/src/GrGpuGLFixed.cpp \
+ gpu/src/GrGpuFactory.cpp \
+ gpu/src/GrGLUtil.cpp \
+ gpu/src/GrGpuGL.cpp \
+ gpu/src/GrInOrderDrawBuffer.cpp \
+ gpu/src/GrMatrix.cpp \
+ gpu/src/GrMemory.cpp \
+ gpu/src/GrPath.cpp \
+ gpu/src/GrRectanizer_fifo.cpp \
+ gpu/src/GrTextureCache.cpp \
+ gpu/src/GrTextContext.cpp \
+ gpu/src/GrTextStrike.cpp \
+ gpu/src/GrBufferAllocPool.cpp\
+ gpu/src/GrPathRenderer.cpp \
+ gpu/src/GrStencil.cpp \
+ src/gpu/SkGpuCanvas.cpp \
+ src/gpu/SkGpuDevice.cpp \
+ src/gpu/SkGr.cpp \
+ src/gpu/SkGrTexturePixelRef.cpp \
+ src/gpu/SkGrFontScaler.cpp \
+ src/gpu/GrPrintf_skia.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+ libcutils \
+ libutils \
+ libskia \
+ libEGL \
+ libGLESv2
+
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/gpu/include \
+ $(LOCAL_PATH)/gpu/src \
+ $(LOCAL_PATH)/include/core \
+ $(LOCAL_PATH)/include/gpu \
+ $(LOCAL_PATH)/src/core
+
+LOCAL_LDLIBS += -lpthread
+
+LOCAL_MODULE:= libskiagpu
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_STATIC_LIBRARY)
+
+#############################################################
# Build the skia tools
#