1 files changed, 37 insertions, 12 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 4db6c75..14d23f8 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -3,23 +3,32 @@ include $(CLEAR_VARS)
 
 
 LOCAL_SRC_FILES:= \
+  AAClipTest.cpp \
   BitmapCopyTest.cpp \
   BitmapGetColorTest.cpp \
   BlitRowTest.cpp \
+  BlurTest.cpp \
+  CanvasTest.cpp \
   ClampRangeTest.cpp \
   ClipCubicTest.cpp \
   ClipStackTest.cpp \
   ClipperTest.cpp \
   ColorFilterTest.cpp \
   ColorTest.cpp \
+  DataRefTest.cpp \
   DequeTest.cpp \
   DrawBitmapRectTest.cpp \
+  EmptyPathTest.cpp \
   FillPathTest.cpp \
   FlateTest.cpp \
   GeometryTest.cpp \
+  GLInterfaceValidation.cpp \
+  GLProgramsTest.cpp \
   InfRectTest.cpp \
   MathTest.cpp \
   MatrixTest.cpp \
+  Matrix44Test.cpp \
+  MemsetTest.cpp \
   MetaDataTest.cpp \
   PackBitsTest.cpp \
   PaintTest.cpp \
@@ -27,37 +36,53 @@ LOCAL_SRC_FILES:= \
   PathCoverageTest.cpp \
   PathMeasureTest.cpp \
   PathTest.cpp \
+  PointTest.cpp \
+  QuickRejectTest.cpp \
   Reader32Test.cpp \
+  ReadPixelsTest.cpp \
   RefDictTest.cpp \
   RegionTest.cpp \
+  ScalarTest.cpp \
+  ShaderOpacityTest.cpp \
   Sk64Test.cpp \
+  skia_test.cpp \
   SortTest.cpp \
   SrcOverTest.cpp \
   StreamTest.cpp \
   StringTest.cpp \
   Test.cpp \
+  Test.h \
   TestSize.cpp \
+  UnicodeTest.cpp \
   UtilsTest.cpp \
+  WArrayTest.cpp \
+  WritePixelsTest.cpp \
   Writer32Test.cpp \
   XfermodeTest.cpp
 
-# The name of the file with a main function must
-# match native test's naming rule: xxx_test.cpp.
-LOCAL_SRC_FILES += \
-  skia_test.cpp
+# TODO: tests that currently are causing build problems
+#LOCAL_SRC_FILES += \
+#  BitSetTest.cpp \
+#  PDFPrimitivesTest.cpp \
+#  ToUnicode.cpp
 
 LOCAL_MODULE:= skia_test
 
 LOCAL_C_INCLUDES := \
-        external/skia/include/core \
-        external/skia/include/effects \
-        external/skia/include/images \
-        external/skia/include/ports \
-        external/skia/include/utils \
-        external/skia/src/core
+   external/freetype/include \
+   external/skia/include/core \
+   external/skia/include/config \
+   external/skia/include/effects \
+   external/skia/include/gpu \
+   external/skia/include/images \
+   external/skia/include/pdf \
+   external/skia/include/ports \
+   external/skia/include/utils \
+   external/skia/src/core \
+   external/skia/src/gpu
 
-LOCAL_SHARED_LIBRARIES := \
-        libskia libcutils
+LOCAL_SHARED_LIBRARIES := libcutils libskia libGLESv2 libEGL
+LOCAL_STATIC_LIBRARIES := libskiagpu
 
 LOCAL_MODULE_TAGS := eng tests