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

Side by Side Diff: gyp/tests.gyp

Issue 26172003: Remove obsolete CityHash conditional. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 months 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 | Annotate | Revision Log
« 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 # GYP file to build unit tests. 1 # GYP file to build unit tests.
2 { 2 {
3 'includes': [ 3 'includes': [
4 'apptype_console.gypi', 4 'apptype_console.gypi',
5 ], 5 ],
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'tests', 8 'target_name': 'tests',
9 'type': 'executable', 9 'type': 'executable',
10 'include_dirs' : [ 10 'include_dirs' : [
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'experimental.gyp:experimental', 152 'experimental.gyp:experimental',
153 'pdf.gyp:pdf', 153 'pdf.gyp:pdf',
154 'tools.gyp:picture_utils', 154 'tools.gyp:picture_utils',
155 ], 155 ],
156 'conditions': [ 156 'conditions': [
157 [ 'skia_gpu == 1', { 157 [ 'skia_gpu == 1', {
158 'include_dirs': [ 158 'include_dirs': [
159 '../src/gpu', 159 '../src/gpu',
160 ], 160 ],
161 }], 161 }],
162 [ 'skia_os == "nacl"', {
163 # CityHash is not supported on NaCl because the NaCl toolchain is
164 # missing byteswap.h which is needed by CityHash.
165 # TODO(borenet): Find a way to either provide this dependency or
166 # replace it.
167 'sources!': [
168 '../tests/BitmapHasherTest.cpp',
169 '../tests/ChecksumTest.cpp',
170 ],
171 }],
172 ], 162 ],
173 }, 163 },
174 ], 164 ],
175 } 165 }
176 166
177 # Local Variables: 167 # Local Variables:
178 # tab-width:2 168 # tab-width:2
179 # indent-tabs-mode:nil 169 # indent-tabs-mode:nil
180 # End: 170 # End:
181 # vim: set expandtab tabstop=2 shiftwidth=2: 171 # vim: set expandtab tabstop=2 shiftwidth=2:
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