Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New SKIA

Browse source
This commit is contained in:
Alexey Pelykh 2012-04-25 19:45:51 +03:00
parent d0e5ad3d4b
commit 054118b3d8
7 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/jni-prebuilt/armeabi-v7a/libskia.a
View file

Binary file not shown.

BIN
OsmAnd/jni-prebuilt/armeabi-v7a/libskia_neon.a
View file

Binary file not shown.

BIN
OsmAnd/jni-prebuilt/armeabi/libskia.a
View file

Binary file not shown.

BIN
OsmAnd/jni-prebuilt/x86/libskia.a
View file

Binary file not shown.

1
OsmAnd/jni/osmand/Android.mk
View file

@ -44,7 +44,6 @@ LOCAL_CFLAGS := \
-DSK_BUILD_FOR_ANDROID \ -DSK_BUILD_FOR_ANDROID \
-DSK_BUILD_FOR_ANDROID_NDK \ -DSK_BUILD_FOR_ANDROID_NDK \
-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \ -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \
-DSK_USE_POSIX_THREADS \
-DSK_RELEASE \ -DSK_RELEASE \
-DGR_RELEASE=1 -DGR_RELEASE=1

9
OsmAnd/jni/skia/Android.mk
View file

@ -84,12 +84,14 @@ LOCAL_SRC_FILES := \
$(OSMAND_SKIA_LOC)/src/core/SkColorTable.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkColorTable.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkComposeShader.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkComposeShader.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkConcaveToTriangles.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkConcaveToTriangles.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkConfig8888.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkCordic.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkCordic.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkCubicClipper.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkCubicClipper.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkData.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkData.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkDebug.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkDebug.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkDeque.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkDeque.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkDevice.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkDevice.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkDeviceProfile.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkDither.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkDither.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkDraw.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkDraw.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkEdgeBuilder.cpp \ $(OSMAND_SKIA_LOC)/src/core/SkEdgeBuilder.cpp \
@ -177,6 +179,7 @@ LOCAL_SRC_FILES := \
$(OSMAND_SKIA_LOC)/src/effects/SkKernel33MaskFilter.cpp \ $(OSMAND_SKIA_LOC)/src/effects/SkKernel33MaskFilter.cpp \
$(OSMAND_SKIA_LOC)/src/effects/SkLayerDrawLooper.cpp \ $(OSMAND_SKIA_LOC)/src/effects/SkLayerDrawLooper.cpp \
$(OSMAND_SKIA_LOC)/src/effects/SkLayerRasterizer.cpp \ $(OSMAND_SKIA_LOC)/src/effects/SkLayerRasterizer.cpp \
$(OSMAND_SKIA_LOC)/src/effects/SkMorphologyImageFilter.cpp \
$(OSMAND_SKIA_LOC)/src/effects/SkPaintFlagsDrawFilter.cpp \ $(OSMAND_SKIA_LOC)/src/effects/SkPaintFlagsDrawFilter.cpp \
$(OSMAND_SKIA_LOC)/src/effects/SkPixelXorXfermode.cpp \ $(OSMAND_SKIA_LOC)/src/effects/SkPixelXorXfermode.cpp \
$(OSMAND_SKIA_LOC)/src/effects/SkPorterDuff.cpp \ $(OSMAND_SKIA_LOC)/src/effects/SkPorterDuff.cpp \
@ -186,6 +189,7 @@ LOCAL_SRC_FILES := \
$(OSMAND_SKIA_LOC)/src/effects/SkTestImageFilters.cpp \ $(OSMAND_SKIA_LOC)/src/effects/SkTestImageFilters.cpp \
$(OSMAND_SKIA_LOC)/src/effects/SkTransparentShader.cpp \ $(OSMAND_SKIA_LOC)/src/effects/SkTransparentShader.cpp \
$(OSMAND_SKIA_LOC)/src/images/bmpdecoderhelper.cpp \ $(OSMAND_SKIA_LOC)/src/images/bmpdecoderhelper.cpp \
$(OSMAND_SKIA_LOC)/src/images/SkBitmapRegionDecoder.cpp \
$(OSMAND_SKIA_LOC)/src/images/SkCreateRLEPixelRef.cpp \ $(OSMAND_SKIA_LOC)/src/images/SkCreateRLEPixelRef.cpp \
$(OSMAND_SKIA_LOC)/src/images/SkFDStream.cpp \ $(OSMAND_SKIA_LOC)/src/images/SkFDStream.cpp \
$(OSMAND_SKIA_LOC)/src/images/SkFlipPixelRef.cpp \ $(OSMAND_SKIA_LOC)/src/images/SkFlipPixelRef.cpp \
@ -216,13 +220,15 @@ LOCAL_SRC_FILES := \
$(OSMAND_SKIA_LOC)/src/ports/SkFontHost_tables.cpp \ $(OSMAND_SKIA_LOC)/src/ports/SkFontHost_tables.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkMemory_malloc.cpp \ $(OSMAND_SKIA_LOC)/src/ports/SkMemory_malloc.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkOSFile_stdio.cpp \ $(OSMAND_SKIA_LOC)/src/ports/SkOSFile_stdio.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkTime_Unix.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkThread_pthread.cpp \ $(OSMAND_SKIA_LOC)/src/ports/SkThread_pthread.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkTime_Unix.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkBase64.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkBoundaryPatch.cpp \ $(OSMAND_SKIA_LOC)/src/utils/SkBoundaryPatch.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkCamera.cpp \ $(OSMAND_SKIA_LOC)/src/utils/SkCamera.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkColorMatrix.cpp \ $(OSMAND_SKIA_LOC)/src/utils/SkColorMatrix.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkCubicInterval.cpp \ $(OSMAND_SKIA_LOC)/src/utils/SkCubicInterval.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkCullPoints.cpp \ $(OSMAND_SKIA_LOC)/src/utils/SkCullPoints.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkDeferredCanvas.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkDumpCanvas.cpp \ $(OSMAND_SKIA_LOC)/src/utils/SkDumpCanvas.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkInterpolator.cpp \ $(OSMAND_SKIA_LOC)/src/utils/SkInterpolator.cpp \
$(OSMAND_SKIA_LOC)/src/utils/SkLayer.cpp \ $(OSMAND_SKIA_LOC)/src/utils/SkLayer.cpp \
@ -310,7 +316,6 @@ LOCAL_CFLAGS += \
-DSK_BUILD_FOR_ANDROID \ -DSK_BUILD_FOR_ANDROID \
-DSK_BUILD_FOR_ANDROID_NDK \ -DSK_BUILD_FOR_ANDROID_NDK \
-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \ -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \
-DSK_USE_POSIX_THREADS \
-DSK_RELEASE \ -DSK_RELEASE \
-DGR_RELEASE=1 \ -DGR_RELEASE=1 \
-DNDEBUG -DNDEBUG

2
OsmAnd/jni/skia/skia_library

@ -1 +1 @@
Subproject commit 1cab2921ab279367f8206cdadc9259d12e603548 Subproject commit 358eae7150db67e5f10071ebb229c5c5b02e6a07