| OLD | NEW | 
|---|
| 1 # Copyright 2014 Google Inc. | 1 # Copyright 2014 Google Inc. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be | 
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. | 
| 5 | 5 | 
| 6 { | 6 { | 
| 7   'variables': { | 7   'targets': [{ | 
| 8     'skia_warnings_as_errors': 0, | 8     'target_name': 'zlib', | 
| 9   }, | 9     'type': 'none', | 
| 10   'targets': [ | 10     'link_settings': { 'libraries': [ '-lz' ] }, | 
| 11     { | 11     'direct_dependent_settings': { | 
| 12       'target_name': 'zlib', |  | 
| 13       'conditions': [ | 12       'conditions': [ | 
| 14         [ 'skia_zlib_static', | 13         [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }] | 
| 15           { | 14       ], | 
| 16             'type': 'static_library', | 15     }, | 
| 17             'include_dirs': [ | 16   }], | 
| 18               '../third_party/externals/zlib', |  | 
| 19             ], |  | 
| 20             'direct_dependent_settings': { |  | 
| 21               'defines': [ |  | 
| 22                 'SK_ZLIB_INCLUDE="zlib.h"', |  | 
| 23               ], |  | 
| 24               'include_dirs': [ |  | 
| 25                 '../third_party/externals/zlib', |  | 
| 26               ], |  | 
| 27             }, |  | 
| 28             'sources': [ |  | 
| 29               '../third_party/externals/zlib/src/adler32.c', |  | 
| 30               '../third_party/externals/zlib/src/compress.c', |  | 
| 31               '../third_party/externals/zlib/src/crc32.c', |  | 
| 32               '../third_party/externals/zlib/src/deflate.c', |  | 
| 33               '../third_party/externals/zlib/src/gzclose.c', |  | 
| 34               '../third_party/externals/zlib/src/gzlib.c', |  | 
| 35               '../third_party/externals/zlib/src/gzread.c', |  | 
| 36               '../third_party/externals/zlib/src/gzwrite.c', |  | 
| 37               '../third_party/externals/zlib/src/infback.c', |  | 
| 38               '../third_party/externals/zlib/src/inffast.c', |  | 
| 39               '../third_party/externals/zlib/src/inflate.c', |  | 
| 40               '../third_party/externals/zlib/src/inftrees.c', |  | 
| 41               '../third_party/externals/zlib/src/trees.c', |  | 
| 42               '../third_party/externals/zlib/src/uncompr.c', |  | 
| 43               '../third_party/externals/zlib/src/zutil.c', |  | 
| 44             ], |  | 
| 45           }, {  # not skia_zlib_static |  | 
| 46             'type': 'none', |  | 
| 47             'direct_dependent_settings': { |  | 
| 48               'conditions': [ |  | 
| 49                 [ 'skia_android_framework', { |  | 
| 50                   'include_dirs': [ |  | 
| 51                     'external/zlib', |  | 
| 52                   ], |  | 
| 53                 }, { |  | 
| 54                   'defines': [ |  | 
| 55                     'SK_SYSTEM_ZLIB=1', |  | 
| 56                   ], |  | 
| 57                 }] |  | 
| 58               ], |  | 
| 59               'link_settings': { |  | 
| 60                 'conditions': [ |  | 
| 61                   [ 'skia_os == "mac" or skia_os == "ios"', { |  | 
| 62                     'libraries': [ |  | 
| 63                       '$(SDKROOT)/usr/lib/libz.dylib', |  | 
| 64                     ] |  | 
| 65                   }, {  # skia_os != "mac" and skia_os != "ios" |  | 
| 66                     'libraries': [ |  | 
| 67                       '-lz', |  | 
| 68                     ] |  | 
| 69                   }], |  | 
| 70                 ], |  | 
| 71               } |  | 
| 72             }, |  | 
| 73           } |  | 
| 74         ] |  | 
| 75       ] |  | 
| 76     } |  | 
| 77   ] |  | 
| 78 } | 17 } | 
| OLD | NEW | 
|---|