diff options
| author |  djsollen <djsollen@google.com> | 2014-08-28 12:04:41 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-28 12:04:41 -0700 |
| commit | 748783d18c0721bce3146950cfcd4adabc90bde8 (patch) | |
| tree | bc1df15083aec886dbdbebbe22dd6d1e1c7b15eb /src | |
| parent | e759a2662273fdf52ebbb3822229945eda317e46 (diff) | |
Ensure that we don't reference decoders that we don't build
R=scroggo@google.com, robertphillips@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/517663002
Diffstat (limited to 'src')
| -rw-r--r-- | src/images/SkForceLinking.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/images/SkForceLinking.cpp b/src/images/SkForceLinking.cpp index 6cc0704e83..4f604a203a 100644 --- a/src/images/SkForceLinking.cpp +++ b/src/images/SkForceLinking.cpp @@ -18,10 +18,13 @@ int SkForceLinking(bool doNotPassTrue) { CreateWEBPImageDecoder(); CreateBMPImageDecoder(); CreateICOImageDecoder(); + CreateWBMPImageDecoder(); + // Only link hardware texture codecs on platforms that build them. See images.gyp +#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK CreatePKMImageDecoder(); CreateKTXImageDecoder(); CreateASTCImageDecoder(); - CreateWBMPImageDecoder(); +#endif // Only link GIF and PNG on platforms that build them. See images.gyp #if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_NACL) \ && !defined(SK_BUILD_FOR_IOS) |