Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: gyp/images.gyp

Issue 1514873003: Remove flag needed by outdated libpng (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 118 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
119 'dependencies': [ 119 'dependencies': [
120 'libpng.gyp:libpng', 120 'libpng.gyp:libpng',
121 ], 121 ],
122 # end libpng stuff 122 # end libpng stuff
123 }], 123 }],
124 [ 'skia_os == "android"', { 124 [ 'skia_os == "android"', {
125 'include_dirs': [ 125 'include_dirs': [
126 '../src/utils', 126 '../src/utils',
127 ], 127 ],
128 'cflags' : [
129 # SkImageDecoder_libpng includes png.h.
130 # In the version of libpng that we use on Android (1.2.46),
131 # there is a missing space between a literal and an identifier
132 # in png.h, triggering a warning in C++11.
133 '-Wno-literal-suffix',
134 ],
135 'dependencies': [ 128 'dependencies': [
136 'libpng.gyp:libpng', 129 'libpng.gyp:libpng',
137 ], 130 ],
138 'conditions': [ 131 'conditions': [
139 [ 'skia_android_framework == 1', { 132 [ 'skia_android_framework == 1', {
140 # The android framework disables these decoders as they are of lit tle use to 133 # The android framework disables these decoders as they are of lit tle use to
141 # Java applications that can't take advantage of the compressed fo rmats. 134 # Java applications that can't take advantage of the compressed fo rmats.
142 'sources!': [ 135 'sources!': [
143 '../src/images/SkImageDecoder_pkm.cpp', 136 '../src/images/SkImageDecoder_pkm.cpp',
144 '../src/images/SkImageDecoder_ktx.cpp', 137 '../src/images/SkImageDecoder_ktx.cpp',
(...skipping 14 matching lines...) Expand all
159 }], 152 }],
160 ], 153 ],
161 'direct_dependent_settings': { 154 'direct_dependent_settings': {
162 'include_dirs': [ 155 'include_dirs': [
163 '../include/images', 156 '../include/images',
164 ], 157 ],
165 }, 158 },
166 }, 159 },
167 ], 160 ],
168 } 161 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698