Revert of For consistency, use our homebrew zlib everywhere possible. (patchset #6 id:100001 of https://codereview.chromium.org/971673005/)
Reason for revert:
Reverting in case this is the cause of the non-Windows failures.
Original issue's description:
> For consistency, use our homebrew zlib everywhere possible.
>
> This switches when we build our own zlib from "just Windows" to "everyone, but
> not Android framework of course".
>
> I tested this by building DM for my Mac and for an Android bot config.
> It took minor tweaks to the GYP to get ARM builds working.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/5a8f2257b0b0f954fb74f65e7ea3ada772ed9240
TBR=scroggo@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/989873002
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
index 7d2eb78..7ae6230 100644
--- a/gyp/zlib.gyp
+++ b/gyp/zlib.gyp
@@ -4,47 +4,45 @@
# found in the LICENSE file.
{
- 'variables': {
- 'skia_warnings_as_errors': 0,
- },
'targets': [
{
+ # Only used by win, down below.
'target_name' : 'zlib_x86_simd',
'type': 'static_library',
'cflags' : ['-msse4.2', '-mpclmul'],
- 'xcode_settings': {
- 'OTHER_CFLAGS': ['-msse4.2', '-mpclmul'],
- },
'sources' : [
- '../third_party/externals/zlib/x86.h',
- '../third_party/externals/zlib/x86.c',
'../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' ],
+ 'conditions': [
+ ['skia_clang_build==1', {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': [ '-msse4.2', '-mpclmul' ],
+ },
},
- },
- }],
- ['skia_os in ["linux", "chromeos"]', {
- 'all_dependent_settings': {
- 'libraries': [ '-lpthread' ],
- },
- }],
- ],
+ }],
+ ],
},
{
'target_name': 'zlib',
+ 'direct_dependent_settings': {
+ 'conditions': [
+ [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }],
+ [ 'skia_os == "mac" or skia_os == "ios"', {
+ # XCode needs and explicit file path, not a logical name like -lz.
+ 'link_settings': { 'libraries': [ '$(SDKROOT)/usr/lib/libz.dylib' ] },
+ }],
+ [ 'skia_os not in ["mac", "ios", "win"]',{
+ 'link_settings': { 'libraries': [ '-lz' ] },
+ }]
+ ],
+ },
'conditions': [
- [ 'skia_android_framework', {
- 'type': 'none',
- 'direct_dependent-settings': {
- 'include_dirs': [ 'external/zlib' ]
- },
- },{
+ [ 'skia_os != "win"', {
+ 'type': 'none',
+ }, {
+ # win
'type': 'static_library',
'sources': [
'../third_party/externals/zlib/adler32.c',
@@ -70,6 +68,8 @@
'../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',
@@ -83,12 +83,8 @@
'../third_party/externals/zlib',
],
},
- 'conditions': [
- [ '"x86" in skia_arch_type', {
- 'dependencies': [ 'zlib_x86_simd' ],
- },{
- 'sources': ['../third_party/externals/zlib/simd_stub.c'],
- }]
+ 'dependencies': [
+ 'zlib_x86_simd',
],
'defines': [
'_CRT_NONSTDC_NO_DEPRECATE',