Index: src/images/SkForceLinking.cpp |
diff --git a/src/images/SkForceLinking.cpp b/src/images/SkForceLinking.cpp |
index 6cc0704e838806216ddf7c2410feb11bba4fa217..4f604a203a87867e1788ea5ddc1b7600972d9e85 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) |