Chromium Code Reviews| 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 'variables': { |
| 8 'skia_warnings_as_errors': 0, | 8 'skia_warnings_as_errors': 0, |
| 9 }, | 9 }, |
| 10 'targets': [ | 10 'targets': [ |
| 11 { | 11 { |
| 12 'target_name': 'zlib', | 12 'target_name': 'zlib', |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 [ 'skia_android_framework', { | 14 [ 'skia_android_framework', { |
| 15 'type': 'none', | 15 'type': 'none', |
| 16 'direct_dependent_settings': { | 16 'direct_dependent_settings': { |
| 17 'include_dirs': [ 'external/zlib' ], | 17 'include_dirs': [ 'external/zlib' ], |
| 18 'link_settings': { 'libraries': [ '-lz' ] }, | 18 'link_settings': { 'libraries': [ '-lz' ] }, |
| 19 }, | 19 }, |
| 20 }, { | 20 }, { |
| 21 'type': 'static_library', | 21 'type': 'static_library', |
| 22 'cflags': [ '-Wno-unused-value' ], | 22 'variables': { |
| 23 'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-unused-value', ], }, | 23 'skia_zlib_flags' : [ |
| 24 '-Wno-unused-value', | |
| 25 '-Wno-shift-negative-value', | |
|
bungeman-skia
2016/05/23 20:53:10
It would be nice to comment here that this was alr
| |
| 26 ], | |
| 27 }, | |
| 28 'cflags': [ '<@(skia_zlib_flags)' ], | |
| 29 'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_zlib_flags)' ], }, | |
| 24 'sources': [ | 30 'sources': [ |
| 25 '../third_party/externals/zlib/adler32.c', | 31 '../third_party/externals/zlib/adler32.c', |
| 26 '../third_party/externals/zlib/compress.c', | 32 '../third_party/externals/zlib/compress.c', |
| 27 '../third_party/externals/zlib/crc32.c', | 33 '../third_party/externals/zlib/crc32.c', |
| 28 '../third_party/externals/zlib/deflate.c', | 34 '../third_party/externals/zlib/deflate.c', |
| 29 '../third_party/externals/zlib/gzclose.c', | 35 '../third_party/externals/zlib/gzclose.c', |
| 30 '../third_party/externals/zlib/gzlib.c', | 36 '../third_party/externals/zlib/gzlib.c', |
| 31 '../third_party/externals/zlib/gzread.c', | 37 '../third_party/externals/zlib/gzread.c', |
| 32 '../third_party/externals/zlib/gzwrite.c', | 38 '../third_party/externals/zlib/gzwrite.c', |
| 33 '../third_party/externals/zlib/infback.c', | 39 '../third_party/externals/zlib/infback.c', |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 47 '../third_party/externals/zlib', | 53 '../third_party/externals/zlib', |
| 48 ], | 54 ], |
| 49 }, | 55 }, |
| 50 'defines': [ | 56 'defines': [ |
| 51 '_CRT_NONSTDC_NO_DEPRECATE', | 57 '_CRT_NONSTDC_NO_DEPRECATE', |
| 52 ], | 58 ], |
| 53 }], | 59 }], |
| 54 ], | 60 ], |
| 55 }], | 61 }], |
| 56 } | 62 } |
| OLD | NEW |