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
diff --git a/src/images/SkForceLinking.cpp b/src/images/SkForceLinking.cpp
index 6cc0704..4f604a2 100644
--- a/src/images/SkForceLinking.cpp
+++ b/src/images/SkForceLinking.cpp
@@ -18,10 +18,13 @@
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)
