Skip to content

GitLab

Commit 3f1a2840 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@132276

parent a89f6ab5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 258 additions and 3136 deletions
Android.mk 0 → 100644
View file @ 3f1a2840
LOCAL_PATH:= $(call my-dir)
#############################################################
# build the corecg library
#
include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES:= \
src/core/Sk64.cpp \
src/core/SkBuffer.cpp \
src/core/SkChunkAlloc.cpp \
src/core/SkCordic.cpp \
src/core/SkDebug.cpp \
src/core/SkDebug_stdio.cpp \
src/core/SkFloatBits.cpp \
src/core/SkMath.cpp \
src/core/SkMatrix.cpp \
src/core/SkMemory_stdlib.cpp \
src/core/SkPoint.cpp \
src/core/SkRect.cpp \
src/core/SkRegion.cpp \
src/core/SkString.cpp \
src/core/SkUtils.cpp \
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include/core
#LOCAL_CFLAGS+=
#LOCAL_LDFLAGS:=
LOCAL_MODULE:= libcorecg
LOCAL_CFLAGS += -fstrict-aliasing
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -fomit-frame-pointer
endif
include $(BUILD_SHARED_LIBRARY)
#############################################################
# build the main sgl library
#
include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES:= \
src/effects/Sk1DPathEffect.cpp \
src/effects/Sk2DPathEffect.cpp \
src/effects/SkAvoidXfermode.cpp \
src/effects/SkBlurDrawLooper.cpp \
src/effects/SkBlurMask.cpp \
src/effects/SkBlurMaskFilter.cpp \
src/effects/SkColorFilters.cpp \
src/effects/SkColorMatrixFilter.cpp \
src/effects/SkCornerPathEffect.cpp \
src/effects/SkDashPathEffect.cpp \
src/effects/SkDiscretePathEffect.cpp \
src/effects/SkEmbossMask.cpp \
src/effects/SkEmbossMaskFilter.cpp \
src/effects/SkGradientShader.cpp \
src/effects/SkLayerDrawLooper.cpp \
src/effects/SkLayerRasterizer.cpp \
src/effects/SkPaintFlagsDrawFilter.cpp \
src/effects/SkPixelXorXfermode.cpp \
src/effects/SkTransparentShader.cpp \
src/images/bmpdecoderhelper.cpp \
src/images/SkFDStream.cpp \
src/images/SkFlipPixelRef.cpp \
src/images/SkImageDecoder.cpp \
src/images/SkImageDecoder_libbmp.cpp \
src/images/SkImageDecoder_libgif.cpp \
src/images/SkImageDecoder_libjpeg.cpp \
src/images/SkImageDecoder_libpng.cpp \
src/images/SkImageDecoder_libico.cpp \
src/images/SkImageDecoder_wbmp.cpp \
src/images/SkImageEncoder.cpp \
src/images/SkImageRef.cpp \
src/images/SkImageRef_GlobalPool.cpp \
src/images/SkImageRefPool.cpp \
src/images/SkMovie.cpp \
src/images/SkMovie_gif.cpp \
src/images/SkPageFlipper.cpp \
src/images/SkScaledBitmapSampler.cpp \
src/images/SkCreateRLEPixelRef.cpp \
src/images/SkImageDecoder_Factory.cpp \
src/images/SkImageEncoder_Factory.cpp \
src/ports/SkFontHost_android.cpp \
src/ports/SkFontHost_gamma.cpp \
src/ports/SkFontHost_FreeType.cpp \
src/ports/SkGlobals_global.cpp \
src/ports/SkImageRef_ashmem.cpp \
src/ports/SkOSFile_stdio.cpp \
src/ports/SkTime_Unix.cpp \
src/ports/SkXMLPullParser_expat.cpp \
src/core/SkAlphaRuns.cpp \
src/core/SkBitmap.cpp \
src/core/SkBitmap_scroll.cpp \
src/core/SkBitmapProcShader.cpp \
src/core/SkBitmapProcState.cpp \
src/core/SkBitmapProcState_matrixProcs.cpp \
src/core/SkBitmapSampler.cpp \
src/core/SkBitmapShader.cpp \
src/core/SkBlitRow_D16.cpp \
src/core/SkBlitRow_D4444.cpp \
src/core/SkBlitter.cpp \
src/core/SkBlitter_4444.cpp \
src/core/SkBlitter_A1.cpp \
src/core/SkBlitter_A8.cpp \
src/core/SkBlitter_ARGB32.cpp \
src/core/SkBlitter_RGB16.cpp \
src/core/SkBlitter_Sprite.cpp \
src/core/SkCanvas.cpp \
src/core/SkColor.cpp \
src/core/SkColorFilter.cpp \
src/core/SkColorTable.cpp \
src/core/SkComposeShader.cpp \
src/core/SkDeque.cpp \
src/core/SkDevice.cpp \
src/core/SkDither.cpp \
src/core/SkDraw.cpp \
src/core/SkEdge.cpp \
src/core/SkFilterProc.cpp \
src/core/SkFlattenable.cpp \
src/core/SkGeometry.cpp \
src/core/SkGlobals.cpp \
src/core/SkGlyphCache.cpp \
src/core/SkGraphics.cpp \
src/core/SkMMapStream.cpp \
src/core/SkMask.cpp \
src/core/SkMaskFilter.cpp \
src/core/SkPackBits.cpp \
src/core/SkPaint.cpp \
src/core/SkPath.cpp \
src/core/SkPathEffect.cpp \
src/core/SkPathHeap.cpp \
src/core/SkPathMeasure.cpp \
src/core/SkPicture.cpp \
src/core/SkPictureFlat.cpp \
src/core/SkPicturePlayback.cpp \
src/core/SkPictureRecord.cpp \
src/core/SkPixelRef.cpp \
src/core/SkProcSpriteBlitter.cpp \
src/core/SkPtrRecorder.cpp \
src/core/SkQuadClipper.cpp \
src/core/SkRasterizer.cpp \
src/core/SkRefCnt.cpp \
src/core/SkRegion_path.cpp \
src/core/SkScalerContext.cpp \
src/core/SkScan.cpp \
src/core/SkScan_AntiPath.cpp \
src/core/SkScan_Antihair.cpp \
src/core/SkScan_Hairline.cpp \
src/core/SkScan_Path.cpp \
src/core/SkShader.cpp \
src/core/SkSpriteBlitter_ARGB32.cpp \
src/core/SkSpriteBlitter_RGB16.cpp \
src/core/SkStream.cpp \
src/core/SkStroke.cpp \
src/core/SkStrokerPriv.cpp \
src/core/SkTSearch.cpp \
src/core/SkTypeface.cpp \
src/core/SkUnPreMultiply.cpp \
src/core/SkXfermode.cpp \
src/core/SkWriter32.cpp \
src/utils/SkCamera.cpp \
src/utils/SkDumpCanvas.cpp \
src/utils/SkInterpolator.cpp \
src/utils/SkNinePatch.cpp \
src/utils/SkProxyCanvas.cpp
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libcorecg \
libexpat \
libz
LOCAL_STATIC_LIBRARIES := \
libft2 \
libpng \
libgif \
libjpeg
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/src/core \
$(LOCAL_PATH)/include/core \
$(LOCAL_PATH)/include/effects \
$(LOCAL_PATH)/include/images \
$(LOCAL_PATH)/include/utils \
$(LOCAL_PATH)/include/xml \
external/freetype/include \
external/zlib \
external/libpng \
external/giflib \
external/expat/lib \
external/jpeg
LOCAL_CFLAGS += -fpic -fstrict-aliasing
ifeq ($(NO_FALLBACK_FONT),true)
LOCAL_CFLAGS += -DNO_FALLBACK_FONT
endif
LOCAL_LDLIBS += -lpthread
LOCAL_MODULE:= libsgl
include $(BUILD_SHARED_LIBRARY)
#############################################################
# Build the skia-opengl glue library
#
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES:= \
src/gl/SkGL.cpp \
src/gl/SkGLCanvas.cpp \
src/gl/SkGLDevice.cpp \
src/gl/SkGLDevice_SWLayer.cpp \
src/gl/SkGLTextCache.cpp \
src/gl/SkTextureCache.cpp
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libsgl \
libcorecg \
libGLESv1_CM
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/src/core \
$(LOCAL_PATH)/src/gl \
$(LOCAL_PATH)/include/core \
$(LOCAL_PATH)/include/effects \
$(LOCAL_PATH)/include/utils
LOCAL_CFLAGS += -fpic -fstrict-aliasing
LOCAL_LDLIBS += -lpthread
LOCAL_MODULE:= libskiagl
include $(BUILD_SHARED_LIBRARY)
libcorecg/MODULE_LICENSE_APACHE2 → MODULE_LICENSE_APACHE2
View file @ 3f1a2840
File moved
libcorecg/NOTICE → NOTICE
View file @ 3f1a2840
File moved
libcorecg/Android.mk deleted 100644 → 0
View file @ a89f6ab5
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES:= \
../src/core/Sk64.cpp \
../src/core/SkBuffer.cpp \
../src/core/SkChunkAlloc.cpp \
../src/core/SkCordic.cpp \
../src/core/SkDebug.cpp \
../src/core/SkDebug_stdio.cpp \
../src/core/SkFloatBits.cpp \
../src/core/SkMath.cpp \
../src/core/SkMatrix.cpp \
../src/core/SkMemory_stdlib.cpp \
../src/core/SkPoint.cpp \
../src/core/SkRect.cpp \
../src/core/SkRegion.cpp \
../src/core/SkString.cpp \
../src/core/SkUtils.cpp \
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../include/core
#LOCAL_CFLAGS+=
#LOCAL_LDFLAGS:=
LOCAL_MODULE:= libcorecg
LOCAL_CFLAGS += -fstrict-aliasing
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -fomit-frame-pointer
endif
include $(BUILD_SHARED_LIBRARY)
libsgl/Android.mk deleted 100644 → 0
View file @ a89f6ab5
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES:= \
../src/effects/Sk1DPathEffect.cpp \
../src/effects/Sk2DPathEffect.cpp \
../src/effects/SkAvoidXfermode.cpp \
../src/effects/SkBlurDrawLooper.cpp \
../src/effects/SkBlurMask.cpp \
../src/effects/SkBlurMaskFilter.cpp \
../src/effects/SkColorFilters.cpp \
../src/effects/SkColorMatrixFilter.cpp \
../src/effects/SkCornerPathEffect.cpp \
../src/effects/SkDashPathEffect.cpp \
../src/effects/SkDiscretePathEffect.cpp \
../src/effects/SkEmbossMask.cpp \
../src/effects/SkEmbossMaskFilter.cpp \
../src/effects/SkGradientShader.cpp \
../src/effects/SkLayerDrawLooper.cpp \
../src/effects/SkLayerRasterizer.cpp \
../src/effects/SkPaintFlagsDrawFilter.cpp \
../src/effects/SkPixelXorXfermode.cpp \
../src/effects/SkTransparentShader.cpp \
../src/images/bmpdecoderhelper.cpp \
../src/images/SkFDStream.cpp \
../src/images/SkFlipPixelRef.cpp \
../src/images/SkImageDecoder.cpp \
../src/images/SkImageDecoder_libbmp.cpp \
../src/images/SkImageDecoder_libgif.cpp \
../src/images/SkImageDecoder_libjpeg.cpp \
../src/images/SkImageDecoder_libpng.cpp \
../src/images/SkImageDecoder_libico.cpp \
../src/images/SkImageDecoder_wbmp.cpp \
../src/images/SkImageEncoder.cpp \
../src/images/SkImageRef.cpp \
../src/images/SkImageRef_GlobalPool.cpp \
../src/images/SkImageRefPool.cpp \
../src/images/SkMovie.cpp \
../src/images/SkMovie_gif.cpp \
../src/images/SkPageFlipper.cpp \
../src/images/SkScaledBitmapSampler.cpp \
../src/images/SkCreateRLEPixelRef.cpp \
../src/images/SkImageDecoder_Factory.cpp \
../src/images/SkImageEncoder_Factory.cpp \
../src/ports/SkFontHost_android.cpp \
../src/ports/SkFontHost_gamma.cpp \
../src/ports/SkFontHost_FreeType.cpp \
../src/ports/SkGlobals_global.cpp \
../src/ports/SkImageRef_ashmem.cpp \
../src/ports/SkOSFile_stdio.cpp \
../src/ports/SkTime_Unix.cpp \
../src/ports/SkXMLPullParser_expat.cpp \
../src/core/SkAlphaRuns.cpp \
../src/core/SkBitmap.cpp \
../src/core/SkBitmap_scroll.cpp \
../src/core/SkBitmapProcShader.cpp \
../src/core/SkBitmapProcState.cpp \
../src/core/SkBitmapProcState_matrixProcs.cpp \
../src/core/SkBitmapSampler.cpp \
../src/core/SkBitmapShader.cpp \
../src/core/SkBlitRow_D16.cpp \
../src/core/SkBlitRow_D4444.cpp \
../src/core/SkBlitter.cpp \
../src/core/SkBlitter_4444.cpp \
../src/core/SkBlitter_A1.cpp \
../src/core/SkBlitter_A8.cpp \
../src/core/SkBlitter_ARGB32.cpp \
../src/core/SkBlitter_RGB16.cpp \
../src/core/SkBlitter_Sprite.cpp \
../src/core/SkCanvas.cpp \
../src/core/SkColor.cpp \
../src/core/SkColorFilter.cpp \
../src/core/SkColorTable.cpp \
../src/core/SkComposeShader.cpp \
../src/core/SkDeque.cpp \
../src/core/SkDevice.cpp \
../src/core/SkDither.cpp \
../src/core/SkDraw.cpp \
../src/core/SkEdge.cpp \
../src/core/SkFilterProc.cpp \
../src/core/SkFlattenable.cpp \
../src/core/SkGeometry.cpp \
../src/core/SkGlobals.cpp \
../src/core/SkGlyphCache.cpp \
../src/core/SkGraphics.cpp \
../src/core/SkMMapStream.cpp \
../src/core/SkMask.cpp \
../src/core/SkMaskFilter.cpp \
../src/core/SkPackBits.cpp \
../src/core/SkPaint.cpp \
../src/core/SkPath.cpp \
../src/core/SkPathEffect.cpp \
../src/core/SkPathHeap.cpp \
../src/core/SkPathMeasure.cpp \
../src/core/SkPicture.cpp \
../src/core/SkPictureFlat.cpp \
../src/core/SkPicturePlayback.cpp \
../src/core/SkPictureRecord.cpp \
../src/core/SkPixelRef.cpp \
../src/core/SkProcSpriteBlitter.cpp \
../src/core/SkPtrRecorder.cpp \
../src/core/SkQuadClipper.cpp \
../src/core/SkRasterizer.cpp \
../src/core/SkRefCnt.cpp \
../src/core/SkRegion_path.cpp \
../src/core/SkScalerContext.cpp \
../src/core/SkScan.cpp \
../src/core/SkScan_AntiPath.cpp \
../src/core/SkScan_Antihair.cpp \
../src/core/SkScan_Hairline.cpp \
../src/core/SkScan_Path.cpp \
../src/core/SkShader.cpp \
../src/core/SkSpriteBlitter_ARGB32.cpp \
../src/core/SkSpriteBlitter_RGB16.cpp \
../src/core/SkStream.cpp \
../src/core/SkStroke.cpp \
../src/core/SkStrokerPriv.cpp \
../src/core/SkTSearch.cpp \
../src/core/SkTypeface.cpp \
../src/core/SkUnPreMultiply.cpp \
../src/core/SkXfermode.cpp \
../src/core/SkWriter32.cpp \
../src/utils/SkCamera.cpp \
../src/utils/SkDumpCanvas.cpp \
../src/utils/SkInterpolator.cpp \
../src/utils/SkNinePatch.cpp \
../src/utils/SkProxyCanvas.cpp
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libcorecg \
libexpat \
libz
LOCAL_STATIC_LIBRARIES := \
libft2 \
libpng \
libgif \
libjpeg
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../src/core \
$(LOCAL_PATH)/../include/core \
$(LOCAL_PATH)/../include/effects \
$(LOCAL_PATH)/../include/images \
$(LOCAL_PATH)/../include/utils \
$(LOCAL_PATH)/../include/xml \
external/freetype/include \
external/zlib \
external/libpng \
external/giflib \
external/expat/lib \
external/jpeg
LOCAL_CFLAGS += -fpic -fstrict-aliasing
ifeq ($(NO_FALLBACK_FONT),true)
LOCAL_CFLAGS += -DNO_FALLBACK_FONT
endif
LOCAL_LDLIBS += -lpthread
LOCAL_MODULE:= libsgl
include $(BUILD_SHARED_LIBRARY)
#
# Build the skia-opengl glue library
#
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES:= \
../src/gl/SkGL.cpp \
../src/gl/SkGLCanvas.cpp \
../src/gl/SkGLDevice.cpp \
../src/gl/SkGLDevice_SWLayer.cpp \
../src/gl/SkGLTextCache.cpp \
../src/gl/SkTextureCache.cpp
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
libsgl \
libcorecg \
libGLESv1_CM
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../src/core \
$(LOCAL_PATH)/../src/gl \
$(LOCAL_PATH)/../include/core \
$(LOCAL_PATH)/../include/effects \
$(LOCAL_PATH)/../include/utils
LOCAL_CFLAGS += -fpic -fstrict-aliasing
LOCAL_LDLIBS += -lpthread
LOCAL_MODULE:= libskiagl
include $(BUILD_SHARED_LIBRARY)
libsgl/MODULE_LICENSE_APACHE2 deleted 100644 → 0
View file @ a89f6ab5
libsgl/animator/SkAnimate3DSchema.xsd deleted 100644 → 0
View file @ a89f6ab5
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:Sk="http://www.skia.com/schema/SkAnimateSchema.xsd"
targetNamespace="urn:skia3D" xmlns:Sk3D="urn:skia3D">
<xs:simpleType name="Patch" >
<xs:restriction base="xs:string" >
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="Point" >
<xs:restriction base="xs:string" >
<xs:pattern value="[+-]?([0-9]*\.[0-9]+|[0-9]+\.?)( *[ ,] *[+-]?([0-9]*\.[0-9]+|[0-9]+\.?)){2}" />
</xs:restriction>
</xs:simpleType>
<xs:element name="camera">
<xs:complexType >
<xs:attribute name="axis" type="Sk3D:Point" />
<xs:attribute name="hackHeight" type="Sk:Float" />
<xs:attribute name="hackWidth" type="Sk:Float" />
<xs:attribute name="location" type="Sk3D:Point" />
<xs:attribute name="observer" type="Sk3D:Point" />
<xs:attribute name="patch" type="Sk3D:Patch" />
<xs:attribute name="zenith" type="Sk3D:Point" />
<xs:attribute name="id" type="xs:ID" />
</xs:complexType>
</xs:element>
<xs:element name="patch">
<xs:complexType >
<xs:attribute name="origin" type="Sk3D:Point" />
<xs:attribute name="rotateDegrees" type="Sk:MemberFunction" />
<xs:attribute name="u" type="Sk3D:Point" />
<xs:attribute name="v" type="Sk3D:Point" />
<xs:attribute name="id" type="xs:ID" />
</xs:complexType>
</xs:element>
</xs:schema>
libsgl/animator/SkAnimate3DSchema.xsx deleted 100644 → 0
View file @ a89f6ab5
<?xml version="1.0" encoding="utf-8"?>
<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
<XSDDesignerLayout />
libsgl/animator/SkAnimateSchema.xsd deleted 100644 → 0
View file @ a89f6ab5
This diff is collapsed.
libsgl/animator/SkAnimateSchema.xsx deleted 100644 → 0
View file @ a89f6ab5
<?xml version="1.0" encoding="utf-8"?>
<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
<XSDDesignerLayout />
libsgl/animator/SkExtraPathEffects.xsd deleted 100644 → 0
View file @ a89f6ab5
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:Sk="urn:screenplay"
xmlns:extra="urn:extraPathEffects" targetNamespace="urn:extraPathEffects" >
<xs:import namespace="urn:screenplay"
schemaLocation="SkAnimateSchema.xsd" />
<xs:element name="composePathEffect" >
<xs:complexType>
<xs:choice maxOccurs="1">
<xs:element ref="Sk:dash"/>
<xs:element ref="extra:shape1DPathEffect"/>
</xs:choice>
<xs:attribute name="id" type="xs:ID"/>
</xs:complexType>
</xs:element>
<xs:element name="shape1DPathEffect" >
<xs:complexType>
<xs:choice maxOccurs="1">
<xs:element ref="Sk:matrix"/>
<xs:element ref="Sk:path"/>
</xs:choice>
<xs:attribute name="addPath" type="Sk:DynamicString" />
<xs:attribute name="matrix" type="Sk:DynamicString" />
<xs:attribute name="path" type="Sk:Path" />
<xs:attribute name="phase" type="Sk:DynamicString"/>
<xs:attribute name="spacing" type="Sk:DynamicString"/>
<xs:attribute name="id" type="xs:ID"/>
</xs:complexType>
</xs:element>
</xs:schema>
libsgl/animator/thingstodo.txt deleted 100644 → 0
View file @ a89f6ab5
things to do:
figure out where endless or very deep recursion is possible
at these points, generate an error if actual physical stack gets too large
candidates are scripts
eval(eval(eval... user callouts
((((( operator precedence or similar making stack deep
groups within groups
very large apply create or apply immediate steps
write tests for math functions
looks like random takes a parameter when it should take zero parameters
add Math, Number files to perforce for docs
alphabetize attributes in docs
manually modified tools/screenplayDocs/xmlToJPEG.cpp
fix docs where lines are stitched together (insert space)
naked <data> outside of <post> asserts on name
handle errors for all element not contained by correct parents
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment