| 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     'use_system_libwebp%': 0, | 7     'use_system_libwebp%': 0, | 
| 8   }, | 8   }, | 
| 9   'conditions': [ | 9   'conditions': [ | 
| 10     ['use_system_libwebp==0', { | 10     ['use_system_libwebp==0', { | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 21             '../third_party/externals/libwebp/dec/frame.c', | 21             '../third_party/externals/libwebp/dec/frame.c', | 
| 22             '../third_party/externals/libwebp/dec/idec.c', | 22             '../third_party/externals/libwebp/dec/idec.c', | 
| 23             '../third_party/externals/libwebp/dec/io.c', | 23             '../third_party/externals/libwebp/dec/io.c', | 
| 24             '../third_party/externals/libwebp/dec/layer.c', | 24             '../third_party/externals/libwebp/dec/layer.c', | 
| 25             '../third_party/externals/libwebp/dec/quant.c', | 25             '../third_party/externals/libwebp/dec/quant.c', | 
| 26             '../third_party/externals/libwebp/dec/tree.c', | 26             '../third_party/externals/libwebp/dec/tree.c', | 
| 27             '../third_party/externals/libwebp/dec/vp8.c', | 27             '../third_party/externals/libwebp/dec/vp8.c', | 
| 28             '../third_party/externals/libwebp/dec/vp8l.c', | 28             '../third_party/externals/libwebp/dec/vp8l.c', | 
| 29             '../third_party/externals/libwebp/dec/webp.c', | 29             '../third_party/externals/libwebp/dec/webp.c', | 
| 30           ], | 30           ], | 
| 31           'cflags!': [ |  | 
| 32             '-fno-rtti', # supresses warnings about invalid option of non-C++ co
     de |  | 
| 33           ], |  | 
| 34         }, | 31         }, | 
| 35         { | 32         { | 
| 36           'target_name': 'libwebp_dsp', | 33           'target_name': 'libwebp_dsp', | 
| 37           'type': 'static_library', | 34           'type': 'static_library', | 
| 38           'include_dirs': [ | 35           'include_dirs': [ | 
| 39               '../third_party/externals/libwebp', | 36               '../third_party/externals/libwebp', | 
| 40           ], | 37           ], | 
| 41           'sources': [ | 38           'sources': [ | 
| 42             '../third_party/externals/libwebp/dsp/cpu.c', | 39             '../third_party/externals/libwebp/dsp/cpu.c', | 
| 43             '../third_party/externals/libwebp/dsp/dec.c', | 40             '../third_party/externals/libwebp/dsp/dec.c', | 
| 44             '../third_party/externals/libwebp/dsp/dec_sse2.c', | 41             '../third_party/externals/libwebp/dsp/dec_sse2.c', | 
| 45             '../third_party/externals/libwebp/dsp/enc.c', | 42             '../third_party/externals/libwebp/dsp/enc.c', | 
| 46             '../third_party/externals/libwebp/dsp/enc_sse2.c', | 43             '../third_party/externals/libwebp/dsp/enc_sse2.c', | 
| 47             '../third_party/externals/libwebp/dsp/lossless.c', | 44             '../third_party/externals/libwebp/dsp/lossless.c', | 
| 48             '../third_party/externals/libwebp/dsp/upsampling.c', | 45             '../third_party/externals/libwebp/dsp/upsampling.c', | 
| 49             '../third_party/externals/libwebp/dsp/upsampling_sse2.c', | 46             '../third_party/externals/libwebp/dsp/upsampling_sse2.c', | 
| 50             '../third_party/externals/libwebp/dsp/yuv.c', | 47             '../third_party/externals/libwebp/dsp/yuv.c', | 
| 51           ], | 48           ], | 
| 52           'cflags!': [ |  | 
| 53             '-fno-rtti', # supresses warnings about invalid option of non-C++ co
     de |  | 
| 54           ], |  | 
| 55           'conditions': [ | 49           'conditions': [ | 
| 56             ['skia_os == "android"', { | 50             ['skia_os == "android"', { | 
| 57               'dependencies' : [ | 51               'dependencies' : [ | 
| 58                 'android_deps.gyp:cpu_features', | 52                 'android_deps.gyp:cpu_features', | 
| 59               ], | 53               ], | 
| 60             }], | 54             }], | 
| 61           ], | 55           ], | 
| 62         }, | 56         }, | 
| 63         { | 57         { | 
| 64           'target_name': 'libwebp_dsp_neon', | 58           'target_name': 'libwebp_dsp_neon', | 
| 65           'conditions': [ | 59           'conditions': [ | 
| 66             ['armv7 == 1', { | 60             ['armv7 == 1', { | 
| 67               'type': 'static_library', | 61               'type': 'static_library', | 
| 68               'include_dirs': [ | 62               'include_dirs': [ | 
| 69                   '../third_party/externals/libwebp', | 63                   '../third_party/externals/libwebp', | 
| 70               ], | 64               ], | 
| 71               'sources': [ | 65               'sources': [ | 
| 72                 '../third_party/externals/libwebp/dsp/dec_neon.c', | 66                 '../third_party/externals/libwebp/dsp/dec_neon.c', | 
| 73               ], | 67               ], | 
| 74               # behavior similar dsp_neon.c.neon in an Android.mk | 68               # behavior similar dsp_neon.c.neon in an Android.mk | 
| 75               'cflags!': [ | 69               'cflags!': [ | 
| 76                 '-mfpu=vfpv3-d16', | 70                 '-mfpu=vfpv3-d16', | 
| 77                 '-fno-rtti', # supresses warnings about invalid option of non-C+
     + code |  | 
| 78               ], | 71               ], | 
| 79               'cflags': [ '-mfpu=neon' ], | 72               'cflags': [ '-mfpu=neon' ], | 
| 80             },{  # "armv7 != 1" | 73             },{  # "armv7 != 1" | 
| 81               'type': 'none', | 74               'type': 'none', | 
| 82             }], | 75             }], | 
| 83           ], | 76           ], | 
| 84         }, | 77         }, | 
| 85         { | 78         { | 
| 86           'target_name': 'libwebp_enc', | 79           'target_name': 'libwebp_enc', | 
| 87           'type': 'static_library', | 80           'type': 'static_library', | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
| 99             '../third_party/externals/libwebp/enc/histogram.c', | 92             '../third_party/externals/libwebp/enc/histogram.c', | 
| 100             '../third_party/externals/libwebp/enc/iterator.c', | 93             '../third_party/externals/libwebp/enc/iterator.c', | 
| 101             '../third_party/externals/libwebp/enc/layer.c', | 94             '../third_party/externals/libwebp/enc/layer.c', | 
| 102             '../third_party/externals/libwebp/enc/picture.c', | 95             '../third_party/externals/libwebp/enc/picture.c', | 
| 103             '../third_party/externals/libwebp/enc/quant.c', | 96             '../third_party/externals/libwebp/enc/quant.c', | 
| 104             '../third_party/externals/libwebp/enc/syntax.c', | 97             '../third_party/externals/libwebp/enc/syntax.c', | 
| 105             '../third_party/externals/libwebp/enc/tree.c', | 98             '../third_party/externals/libwebp/enc/tree.c', | 
| 106             '../third_party/externals/libwebp/enc/vp8l.c', | 99             '../third_party/externals/libwebp/enc/vp8l.c', | 
| 107             '../third_party/externals/libwebp/enc/webpenc.c', | 100             '../third_party/externals/libwebp/enc/webpenc.c', | 
| 108           ], | 101           ], | 
| 109           'cflags!': [ |  | 
| 110             '-fno-rtti', # supresses warnings about invalid option of non-C++ co
     de |  | 
| 111           ], |  | 
| 112         }, | 102         }, | 
| 113         { | 103         { | 
| 114           'target_name': 'libwebp_utils', | 104           'target_name': 'libwebp_utils', | 
| 115           'type': 'static_library', | 105           'type': 'static_library', | 
| 116           'include_dirs': [ | 106           'include_dirs': [ | 
| 117               '../third_party/externals/libwebp', | 107               '../third_party/externals/libwebp', | 
| 118           ], | 108           ], | 
| 119           'sources': [ | 109           'sources': [ | 
| 120             '../third_party/externals/libwebp/utils/bit_reader.c', | 110             '../third_party/externals/libwebp/utils/bit_reader.c', | 
| 121             '../third_party/externals/libwebp/utils/bit_writer.c', | 111             '../third_party/externals/libwebp/utils/bit_writer.c', | 
| 122             '../third_party/externals/libwebp/utils/color_cache.c', | 112             '../third_party/externals/libwebp/utils/color_cache.c', | 
| 123             '../third_party/externals/libwebp/utils/filters.c', | 113             '../third_party/externals/libwebp/utils/filters.c', | 
| 124             '../third_party/externals/libwebp/utils/huffman.c', | 114             '../third_party/externals/libwebp/utils/huffman.c', | 
| 125             '../third_party/externals/libwebp/utils/huffman_encode.c', | 115             '../third_party/externals/libwebp/utils/huffman_encode.c', | 
| 126             '../third_party/externals/libwebp/utils/quant_levels.c', | 116             '../third_party/externals/libwebp/utils/quant_levels.c', | 
| 127             '../third_party/externals/libwebp/utils/rescaler.c', | 117             '../third_party/externals/libwebp/utils/rescaler.c', | 
| 128             '../third_party/externals/libwebp/utils/thread.c', | 118             '../third_party/externals/libwebp/utils/thread.c', | 
| 129             '../third_party/externals/libwebp/utils/utils.c', | 119             '../third_party/externals/libwebp/utils/utils.c', | 
| 130           ], | 120           ], | 
| 131           'cflags!': [ |  | 
| 132             '-fno-rtti', # supresses warnings about invalid option of non-C++ co
     de |  | 
| 133           ], |  | 
| 134         }, | 121         }, | 
| 135         { | 122         { | 
| 136           'target_name': 'libwebp', | 123           'target_name': 'libwebp', | 
| 137           'type': 'none', | 124           'type': 'none', | 
| 138           'dependencies' : [ | 125           'dependencies' : [ | 
| 139             'libwebp_dec', | 126             'libwebp_dec', | 
| 140             'libwebp_dsp', | 127             'libwebp_dsp', | 
| 141             'libwebp_dsp_neon', | 128             'libwebp_dsp_neon', | 
| 142             'libwebp_enc', | 129             'libwebp_enc', | 
| 143             'libwebp_utils', | 130             'libwebp_utils', | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 165           'link_settings': { | 152           'link_settings': { | 
| 166             'libraries': [ | 153             'libraries': [ | 
| 167               '-lwebp', | 154               '-lwebp', | 
| 168             ], | 155             ], | 
| 169           }, | 156           }, | 
| 170         } | 157         } | 
| 171       ], | 158       ], | 
| 172     }], | 159     }], | 
| 173   ], | 160   ], | 
| 174 } | 161 } | 
| OLD | NEW | 
|---|