e6cf9cb685
- Adds miniz.c v115_r4 (latest release) to third_party.
- Merges SkDeflateWStream into SkFlate so including "miniz.c" links
without duplicating symbols.
The only interesting code change I've made is to remove the line
fImpl->fZStream.data_type = Z_BINARY;
from SkDeflateWStream::SkDeflateWStream(). miniz doesn't have Z_BINARY
defined, and as far as I can tell, both zlib and miniz ignore data_type.
We should be able to swap skflate.gyp's dependency between zlib.gyp:zlib and
zlib.gyp:miniz at will (except of course on Windows) if we're interested in
zlib itself. I've left android framework on its own zlib. I think this all
means we can stop defining SK_NO_FLATE on Windows.
I'll leave the possible cleanup of SK_NO_FLATE itself for another time. Might
be we always want to keep this dependency optional.
CQ_EXTRA_TRYBOTS=client.skia:Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot
BUG=skia:
Review URL: https://codereview.chromium.org/957323003
45 lines
1.8 KiB
Python
45 lines
1.8 KiB
Python
# Include this gypi to include all 'pdf' files
|
|
# The parent gyp/gypi file must define
|
|
# 'skia_src_path' e.g. skia/trunk/src
|
|
# 'skia_include_path' e.g. skia/trunk/include
|
|
#
|
|
# The skia build defines these in common_variables.gypi
|
|
#
|
|
{
|
|
'sources': [
|
|
'<(skia_src_path)/doc/SkDocument_PDF.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFBitmap.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFBitmap.h',
|
|
'<(skia_src_path)/pdf/SkPDFCanon.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFCanon.h',
|
|
'<(skia_src_path)/pdf/SkPDFCatalog.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFCatalog.h',
|
|
'<(skia_src_path)/pdf/SkPDFDevice.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFDevice.h',
|
|
'<(skia_src_path)/pdf/SkPDFDocument.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFDocument.h',
|
|
'<(skia_src_path)/pdf/SkPDFFont.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFFont.h',
|
|
'<(skia_src_path)/pdf/SkPDFFontImpl.h',
|
|
'<(skia_src_path)/pdf/SkPDFFormXObject.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFFormXObject.h',
|
|
'<(skia_src_path)/pdf/SkPDFGraphicState.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFGraphicState.h',
|
|
'<(skia_src_path)/pdf/SkPDFImage.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFImage.h',
|
|
'<(skia_src_path)/pdf/SkPDFPage.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFPage.h',
|
|
'<(skia_src_path)/pdf/SkPDFResourceDict.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFResourceDict.h',
|
|
'<(skia_src_path)/pdf/SkPDFShader.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFShader.h',
|
|
'<(skia_src_path)/pdf/SkPDFStream.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFStream.h',
|
|
'<(skia_src_path)/pdf/SkPDFTypes.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFTypes.h',
|
|
'<(skia_src_path)/pdf/SkPDFUtils.cpp',
|
|
'<(skia_src_path)/pdf/SkPDFUtils.h',
|
|
'<(skia_src_path)/pdf/SkTSet.h',
|
|
],
|
|
}
|