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

Side by Side Diff: gyp/libjpeg.gyp

Issue 1180983002: Switch SkJpegCode to libjpeg-turbo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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
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
11 { 11 {
12 'variables': { 12 'variables': {
13 'use_system_libjpeg%': 0, 13 'use_system_libjpeg%': 0,
14 'skia_warnings_as_errors': 0, 14 'skia_warnings_as_errors': 0,
15 }, 15 },
16 'conditions': [ 16 'conditions': [
17 ['skia_os == "android"', { 17 ['skia_os == "android"', {
18 'targets': [ 18 'targets': [
19 { 19 {
20 'target_name': 'libjpeg', 20 'target_name': 'libjpeg',
21 'type': 'none', 21 'type': 'none',
22 'dependencies': [ 22 'dependencies': [
23 'android_deps.gyp:jpeg', 23 '../third_party/libjpeg-turbo/libjpeg-turbo-code/libjpeg-turbo.gyp:l ibjpeg-turbo',
scroggo 2015/06/16 20:39:22 I don't see any reason not to use turbo on all pla
msarett 2015/06/18 21:06:10 Yes agreed.
24 ], 24 ],
25 'export_dependent_settings': [ 25 'export_dependent_settings': [
26 'android_deps.gyp:jpeg', 26 '../third_party/libjpeg-turbo/libjpeg-turbo-code/libjpeg-turbo.gyp:l ibjpeg-turbo',
27 ], 27 ],
28 }, 28 },
29 ], 29 ],
30 }, { # skia_os != android 30 }, { # skia_os != android
31 'conditions': [ 31 'conditions': [
32 ['use_system_libjpeg==0', { 32 ['use_system_libjpeg==0', {
33 'targets': [ 33 'targets': [
34 { 34 {
35 'target_name': 'libjpeg', 35 'target_name': 'libjpeg',
36 'type': 'static_library', 36 'type': 'static_library',
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 '-ljpeg', 121 '-ljpeg',
122 ], 122 ],
123 }, 123 },
124 } 124 }
125 ], 125 ],
126 }], 126 }],
127 ], 127 ],
128 }], 128 }],
129 ], 129 ],
130 } 130 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698