Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 'raw_codec', | |
| 20 'giflib.gyp:giflib', | 21 'giflib.gyp:giflib', |
| 21 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', | 22 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', |
| 22 'libpng.gyp:libpng', | 23 'libpng.gyp:libpng', |
| 23 'libwebp.gyp:libwebp', | 24 'libwebp.gyp:libwebp', |
| 24 ], | 25 ], |
| 25 'cflags':[ | 26 'cflags':[ |
| 26 # FIXME: This gets around a longjmp warning. See | 27 # FIXME: This gets around a longjmp warning. See |
| 27 # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu- GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio | 28 # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu- GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio |
| 28 '-Wno-clobbered -Wno-error', | 29 '-Wno-clobbered -Wno-error', |
| 29 ], | 30 ], |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 56 '../src/codec/SkWebpCodec.cpp', | 57 '../src/codec/SkWebpCodec.cpp', |
| 57 ], | 58 ], |
| 58 'direct_dependent_settings': { | 59 'direct_dependent_settings': { |
| 59 'include_dirs': [ | 60 'include_dirs': [ |
| 60 '../include/codec', | 61 '../include/codec', |
| 61 ], | 62 ], |
| 62 }, | 63 }, |
| 63 'defines': [ | 64 'defines': [ |
| 64 'TURBO_HAS_SKIP', | 65 'TURBO_HAS_SKIP', |
| 65 ], | 66 ], |
| 67 }, { | |
| 68 'target_name': 'raw_codec', | |
| 69 'product_name': 'raw_codec', | |
| 70 'type': 'static_library', | |
| 71 'dependencies': [ | |
| 72 'core.gyp:*', | |
| 73 'dng_sdk.gyp:dng_sdk-selector', | |
| 74 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', | |
| 75 'piex.gyp:piex-selector', | |
| 76 ], | |
| 77 'cflags':[ | |
| 78 '-fexceptions', | |
| 79 '-DSK_CODEC_DECODES_RAW', | |
|
scroggo
2016/01/07 20:57:42
This is a step in the right direction. But it does
yujieqin
2016/01/08 14:00:12
So we can postpone the change you mentioned for no
scroggo
2016/01/08 17:12:25
You mean the change to factor out the exceptions?
yujieqin
2016/01/11 14:03:07
We define the variable "skia_codec_decodes_raw" in
| |
| 80 ], | |
| 81 'include_dirs': [ | |
| 82 '../include/codec', | |
| 83 '../include/private', | |
| 84 '../src/codec', | |
| 85 '../src/core', | |
| 86 ], | |
| 87 'sources': [ | |
| 88 '../src/codec/SkRawAdapterCodec.cpp', | |
| 89 '../src/codec/SkRawCodec.cpp', | |
| 90 ], | |
| 91 'direct_dependent_settings': { | |
| 92 'include_dirs': [ | |
| 93 '../include/codec', | |
| 94 ], | |
| 95 'cflags':[ | |
|
msarett
2016/01/07 16:39:11
IIUC, cflags is not respected on all platforms (ma
yujieqin
2016/01/08 14:00:12
Done.
| |
| 96 '-DSK_CODEC_DECODES_RAW', | |
| 97 ], | |
| 98 }, | |
| 99 'defines': [ | |
| 100 'TURBO_HAS_SKIP', | |
| 101 ], | |
| 102 'conditions': [ | |
| 103 ['OS == "ios" or OS == "mac"', { | |
| 104 'xcode_settings': { | |
| 105 'OTHER_CFLAGS': ['-fexceptions'], | |
| 106 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'], | |
| 107 }, | |
| 108 }], | |
| 109 ], | |
| 66 }, | 110 }, |
| 67 ], | 111 ], |
| 68 } | 112 } |
| OLD | NEW |