AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always build our own zlib.

Browse Source 
If we want to have an MSAN build, it'll help if we can build our own zlib
so that it's instrumented by MSAN.

Today we build our own zlib on Windows, but require the system to provide it
elsewhere.  This just makes everyone build it (except Android framework of course).

This drops the SIMD files.  They're only used to accelerate deflate
(compression), so they're not terribly interesting to us.  Again, this only
really changes compression speed on Windows bots... pretty niche.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1665843002

Review URL: https://codereview.chromium.org/1665843002
This commit is contained in:
mtklein 2016-02-03 07:06:27 -08:00 committed by Commit bot
parent f16e2a2e92
commit 84b8d897c2
1 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gyp/zlib.gyp
View File

@ -8,75 +8,34 @@
'skia_warnings_as_errors': 0,
},
'targets': [
{
# Only used by win, down below.
'target_name' : 'zlib_x86_simd',
'type': 'static_library',
'cflags' : ['-msse4.2', '-mpclmul'],
'sources' : [
'../third_party/externals/zlib/crc_folding.c',
'../third_party/externals/zlib/fill_window_sse.c',
],
'conditions': [
['skia_clang_build==1', {
'msvs_settings': {
'VCCLCompilerTool': {
'AdditionalOptions': [ '-msse4.2', '-mpclmul' ],
},
},
}],
],
},
{
'target_name': 'zlib',
'direct_dependent_settings': {
'conditions': [
[ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }],
[ 'skia_os == "mac" or skia_os == "ios"', {
# XCode needs a full library name, not -lz.
'link_settings': { 'libraries': [ 'libz.dylib' ] },
}],
[ 'skia_os not in ["mac", "ios", "win"]',{
'link_settings': { 'libraries': [ '-lz' ] },
}]
],
},
'conditions': [
[ 'skia_os != "win"', {
[ 'skia_android_framework', {
'type': 'none',
'direct_dependent_settings': {
'include_dirs': [ 'external/zlib' ],
'link_settings': { 'libraries': [ '-lz' ] },
},
}, {
# win
'type': 'static_library',
'sources': [
'../third_party/externals/zlib/adler32.c',
'../third_party/externals/zlib/compress.c',
'../third_party/externals/zlib/crc32.c',
'../third_party/externals/zlib/crc32.h',
'../third_party/externals/zlib/deflate.c',
'../third_party/externals/zlib/deflate.h',
'../third_party/externals/zlib/gzclose.c',
'../third_party/externals/zlib/gzguts.h',
'../third_party/externals/zlib/gzlib.c',
'../third_party/externals/zlib/gzread.c',
'../third_party/externals/zlib/gzwrite.c',
'../third_party/externals/zlib/infback.c',
'../third_party/externals/zlib/inffast.c',
'../third_party/externals/zlib/inffast.h',
'../third_party/externals/zlib/inffixed.h',
'../third_party/externals/zlib/inflate.c',
'../third_party/externals/zlib/inflate.h',
'../third_party/externals/zlib/inftrees.c',
'../third_party/externals/zlib/inftrees.h',
'../third_party/externals/zlib/mozzconf.h',
'../third_party/externals/zlib/simd_stub.c',
'../third_party/externals/zlib/trees.c',
'../third_party/externals/zlib/trees.h',
'../third_party/externals/zlib/uncompr.c',
'../third_party/externals/zlib/x86.h',
'../third_party/externals/zlib/x86.c',
'../third_party/externals/zlib/zconf.h',
'../third_party/externals/zlib/zlib.h',
'../third_party/externals/zlib/zutil.c',
'../third_party/externals/zlib/zutil.h',
],
'include_dirs': [
'../third_party/externals/zlib/',
@ -86,9 +45,6 @@
'../third_party/externals/zlib',
],
},
'dependencies': [
'zlib_x86_simd',
],
'defines': [
'_CRT_NONSTDC_NO_DEPRECATE',
],