OLD | NEW |
1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 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 # GYP file for images project. | 6 # GYP file for images project. |
7 { | 7 { |
8 'targets': [ | 8 'targets': [ |
9 { | 9 { |
10 'target_name': 'images', | 10 'target_name': 'images', |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 ], | 124 ], |
125 # end libpng stuff | 125 # end libpng stuff |
126 }], | 126 }], |
127 [ 'skia_os == "android"', { | 127 [ 'skia_os == "android"', { |
128 'include_dirs': [ | 128 'include_dirs': [ |
129 '../src/utils', | 129 '../src/utils', |
130 ], | 130 ], |
131 'dependencies': [ | 131 'dependencies': [ |
132 'android_deps.gyp:png', | 132 'android_deps.gyp:png', |
133 ], | 133 ], |
| 134 'cflags' : [ |
| 135 # SkImageDecoder_libpng includes png.h. |
| 136 # In the version of libpng that we use on Android (1.2.46), |
| 137 # there is a missing space between a literal and an identifier |
| 138 # in png.h, triggering a warning in C++11. |
| 139 '-Wno-literal-suffix', |
| 140 ], |
134 'conditions': [ | 141 'conditions': [ |
135 [ 'skia_android_framework == 0', { | 142 [ 'skia_android_framework == 0', { |
136 'export_dependent_settings': [ | 143 'export_dependent_settings': [ |
137 'android_deps.gyp:png', | 144 'android_deps.gyp:png', |
138 'libjpeg.gyp:*' | 145 'libjpeg.gyp:*' |
139 ], | 146 ], |
140 }, { | 147 }, { |
141 # The android framework disables these decoders as they are of lit
tle use to | 148 # The android framework disables these decoders as they are of lit
tle use to |
142 # Java applications that can't take advantage of the compressed fo
rmats. | 149 # Java applications that can't take advantage of the compressed fo
rmats. |
143 'sources!': [ | 150 'sources!': [ |
(...skipping 16 matching lines...) Expand all Loading... |
160 }], | 167 }], |
161 ], | 168 ], |
162 'direct_dependent_settings': { | 169 'direct_dependent_settings': { |
163 'include_dirs': [ | 170 'include_dirs': [ |
164 '../include/images', | 171 '../include/images', |
165 ], | 172 ], |
166 }, | 173 }, |
167 }, | 174 }, |
168 ], | 175 ], |
169 } | 176 } |
OLD | NEW |