aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-03-17 10:11:26 -0400
committerDerek Sollenberger <djsollen@google.com>2011-03-17 10:11:26 -0400
commit74620984a3d6d6d9ca2e564a487a00b987a9eb33 (patch)
tree8932fe4746c80bcaf6ebf14aa761e52a10556a1f
parentea865e804a942e6de638828167d4422c5b44538a (diff)
downloadexternal_skia-74620984a3d6d6d9ca2e564a487a00b987a9eb33.zip
external_skia-74620984a3d6d6d9ca2e564a487a00b987a9eb33.tar.gz
external_skia-74620984a3d6d6d9ca2e564a487a00b987a9eb33.tar.bz2
Build the golden master tests for skia.
Change-Id: I6cb3b47a36f8c334c7bfb77af6ea957bd2d78cf5
-rw-r--r--Android.mk7
-rw-r--r--gm/Android.mk9
2 files changed, 13 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 2d4acbd..26989b2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,11 +58,13 @@ LOCAL_SRC_FILES:= \
src/effects/SkEmbossMask.cpp \
src/effects/SkEmbossMaskFilter.cpp \
src/effects/SkGradientShader.cpp \
+ src/effects/SkGroupShape.cpp \
src/effects/SkLayerDrawLooper.cpp \
src/effects/SkLayerRasterizer.cpp \
src/effects/SkPaintFlagsDrawFilter.cpp \
src/effects/SkPixelXorXfermode.cpp \
src/effects/SkPorterDuff.cpp \
+ src/effects/SkRectShape.cpp \
src/effects/SkTableMaskFilter.cpp \
src/effects/SkTransparentShader.cpp \
src/images/bmpdecoderhelper.cpp \
@@ -182,7 +184,8 @@ LOCAL_SRC_FILES:= \
src/utils/SkNinePatch.cpp \
src/utils/SkParse.cpp \
src/utils/SkParsePath.cpp \
- src/utils/SkProxyCanvas.cpp
+ src/utils/SkProxyCanvas.cpp \
+ src/utils/SkUnitMappers.cpp
ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES += \
@@ -314,7 +317,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(BASE_PATH)/bench/Android.mk
# golden-master (fidelity / regression test)
-#include $(BASE_PATH)/gm/Android.mk
+include $(BASE_PATH)/gm/Android.mk
# unit-tests
include $(BASE_PATH)/tests/Android.mk
diff --git a/gm/Android.mk b/gm/Android.mk
index 15e56d6..e7960d4 100644
--- a/gm/Android.mk
+++ b/gm/Android.mk
@@ -21,7 +21,14 @@ LOCAL_SRC_FILES := \
LOCAL_SRC_FILES += \
../src/utils/SkEGLContext_none.cpp
-LOCAL_SHARED_LIBRARIES := libcutils libskia
+LOCAL_STATIC_LIBRARIES := libskiagpu
+LOCAL_SHARED_LIBRARIES := \
+ libcutils \
+ libutils \
+ libskia \
+ libEGL \
+ libGLESv2
+
LOCAL_C_INCLUDES := \
external/skia/include/config \
external/skia/include/core \