| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'skia_warnings_as_errors': 0, |
| 7 'conditions':[ | 8 'conditions':[ |
| 8 ['skia_android_framework == 1', { | 9 ['skia_android_framework == 1', { |
| 9 'use_system_libwebp': 1, | 10 'use_system_libwebp': 1, |
| 10 }, { | 11 }, { |
| 11 'use_system_libwebp%': 0, | 12 'use_system_libwebp%': 0, |
| 12 }], | 13 }], |
| 13 ], | 14 ], |
| 14 }, | 15 }, |
| 15 'conditions': [ | 16 'conditions': [ |
| 16 ['use_system_libwebp==0', { | 17 ['use_system_libwebp==0', { |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 'libwebp_demux', | 153 'libwebp_demux', |
| 153 'libwebp_dsp', | 154 'libwebp_dsp', |
| 154 'libwebp_dsp_neon', | 155 'libwebp_dsp_neon', |
| 155 'libwebp_enc', | 156 'libwebp_enc', |
| 156 'libwebp_utils', | 157 'libwebp_utils', |
| 157 ], | 158 ], |
| 158 'direct_dependent_settings': { | 159 'direct_dependent_settings': { |
| 159 'include_dirs': [ | 160 'include_dirs': [ |
| 160 '../third_party/externals/libwebp/src', | 161 '../third_party/externals/libwebp/src', |
| 161 ], | 162 ], |
| 163 'cflags': [ |
| 164 '-Wno-unused-function', # In C++11 mode, we get this warning when
including decode.h. |
| 165 ] |
| 162 }, | 166 }, |
| 163 'conditions': [ | 167 'conditions': [ |
| 164 ['OS!="win"', {'product_name': 'webp'}], | 168 ['OS!="win"', {'product_name': 'webp'}], |
| 165 ], | 169 ], |
| 166 }, | 170 }, |
| 167 ], | 171 ], |
| 168 }, { | 172 }, { |
| 169 # use_system_libwep == 1 | 173 # use_system_libwep == 1 |
| 170 'targets': [ | 174 'targets': [ |
| 171 { | 175 { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 194 ], | 198 ], |
| 195 }, | 199 }, |
| 196 }, | 200 }, |
| 197 ], | 201 ], |
| 198 ], | 202 ], |
| 199 } | 203 } |
| 200 ], | 204 ], |
| 201 }], | 205 }], |
| 202 ], | 206 ], |
| 203 } | 207 } |
| OLD | NEW |