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

Unified Diff: src/images/SkForceLinking.cpp

Issue 517663002: Ensure that we don't reference decoders that we don't build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698