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

Side by Side Diff: gyp/codec.gyp

Issue 1180983002: Switch SkJpegCode to libjpeg-turbo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix xcode builds Created 5 years, 5 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 | « dm/DM.cpp ('k') | gyp/libjpeg-turbo.gyp » ('j') | 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 # Copyright 2015 Google Inc. 5 # Copyright 2015 Google Inc.
6 # 6 #
7 # Use of this source code is governed by a BSD-style license that can be 7 # Use of this source code is governed by a BSD-style license that can be
8 # found in the LICENSE file. 8 # found in the LICENSE file.
9 9
10 # GYP file for codec project. 10 # GYP file for codec project.
11 { 11 {
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'codec', 14 'target_name': 'codec',
15 'product_name': 'skia_codec', 15 'product_name': 'skia_codec',
16 'type': 'static_library', 16 'type': 'static_library',
17 'standalone_static_library': 1, 17 'standalone_static_library': 1,
18 'dependencies': [ 18 'dependencies': [
19 'core.gyp:*', 19 'core.gyp:*',
20 'giflib.gyp:giflib', 20 'giflib.gyp:giflib',
21 'libjpeg.gyp:libjpeg', 21 'libjpeg-turbo.gyp:libjpeg-turbo',
22 'libwebp.gyp:libwebp', 22 'libwebp.gyp:libwebp',
23 ], 23 ],
24 'export_dependent_settings': [
25 'libjpeg-turbo.gyp:libjpeg-turbo',
26 ],
24 'cflags':[ 27 'cflags':[
25 # FIXME: This gets around a longjmp warning. See 28 # FIXME: This gets around a longjmp warning. See
26 # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu- GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio 29 # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu- GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio
27 '-Wno-clobbered', 30 '-Wno-clobbered',
28 ], 31 ],
29 'include_dirs': [ 32 'include_dirs': [
30 '../include/codec', 33 '../include/codec',
31 '../src/codec', 34 '../src/codec',
32 '../src/core', 35 '../src/core',
33 ], 36 ],
(...skipping 19 matching lines...) Expand all
53 ], 56 ],
54 }, 57 },
55 'conditions': [ 58 'conditions': [
56 [ 'skia_android_framework == 1', 59 [ 'skia_android_framework == 1',
57 { 60 {
58 # TODO(djsollen): this is a temporary dependency until we can update 61 # TODO(djsollen): this is a temporary dependency until we can update
59 # the android framework to a more recent version of libpng. 62 # the android framework to a more recent version of libpng.
60 'dependencies': [ 63 'dependencies': [
61 'libpng.gyp:libpng', 64 'libpng.gyp:libpng',
62 ], 65 ],
66 # TODO(msarett): update libjpeg-turbo on Android so we can compile S kJpegCodec
67 # for the framework.
68 'sources!': [
69 '../src/codec/SkJpegCodec.cpp',
70 '../src/codec/SkJpegDecoderMgr.cpp',
71 '../src/codec/SkJpegUtility_codec.cpp',
72 ],
73 'dependencies!': [
74 'libjpeg-turbo.gyp:libjpeg-turbo',
75 ],
63 }, { # !skia_android_framework 76 }, { # !skia_android_framework
64 'dependencies': [ 77 'dependencies': [
65 'libpng.gyp:libpng_static', 78 'libpng.gyp:libpng_static',
66 ], 79 ],
80 'cflags': [
81 '-DTURBO_HAS_SKIP',
82 ],
67 } 83 }
68 ] 84 ]
69 ] 85 ]
70 }, 86 },
71 ], 87 ],
72 } 88 }
OLDNEW
« no previous file with comments | « dm/DM.cpp ('k') | gyp/libjpeg-turbo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698