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

Side by Side Diff: gyp/libjpeg.gyp

Issue 1286833002: Hopefully fix ios bots (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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
« 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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified 5 # This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified
6 # such that all source paths point into that directory. 6 # such that all source paths point into that directory.
7 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp 7 # See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp
8 # from Chrome's libjpeg port, rather than making our own copy') for a better 8 # from Chrome's libjpeg port, rather than making our own copy') for a better
9 # long-term solution. 9 # long-term solution.
10 10
(...skipping 15 matching lines...) Expand all
26 'android_deps.gyp:jpeg', 26 'android_deps.gyp:jpeg',
27 ], 27 ],
28 }, 28 },
29 ], 29 ],
30 }, { # skia_os != android 30 }, { # skia_os != android
31 'targets': [ 31 'targets': [
32 { 32 {
33 'target_name': 'libjpeg', 33 'target_name': 'libjpeg',
34 'type': 'none', 34 'type': 'none',
35 'dependencies': [ 35 'dependencies': [
36 'libjpeg-turbo.gyp:*', 36 'libjpeg-turbo.gyp:libjpeg-turbo',
37 ], 37 ],
38 'export_dependent_settings': [ 38 'export_dependent_settings': [
39 'libjpeg-turbo.gyp:*', 39 'libjpeg-turbo.gyp:libjpeg-turbo',
40 ], 40 ],
41 }, 41 },
42 ], 42 ],
43 }], 43 }],
44 ], 44 ],
45 } 45 }
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