Force linking with image decoders for images project.

Previously, each tool that wanted to use image decoders
but did not specifically reference them had to create a
dummy function that references them in order to ensure
they are not stripped by the linker.

Instead of making each tool reference each image decoder,
do it once in SkImageDecoder.cpp. Now each tool will have
image decoders linked in, assuming it includes the images
project.

This fixes a bug where SKPs with encoded data could not
be read by bench_ or render_pictures.

R=djsollen@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/14678003

git-svn-id: http://skia.googlecode.com/svn/trunk@8941 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 0 insertions, 16 deletions

diff --git a/debugger/SkDebugger.cpp b/debugger/SkDebugger.cpp
index 3a13579894..1e39b8e351 100644
--- a/debugger/SkDebugger.cpp
+++ b/debugger/SkDebugger.cpp
@@ -129,19 +129,3 @@ void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes,
     overview->append("px");
 }
 
-#include "SkImageDecoder.h"
-
-void forceLinking();
-void forceLinking() {
-    // This function leaks, but that is okay because it is not intended
-    // to be called. It is only here so that the linker will include the
-    // decoders.
-    SkDEBUGCODE(SkImageDecoder *creator = ) CreateJPEGImageDecoder();
-    SkASSERT(creator);
-    SkDEBUGCODE(creator = ) CreateWEBPImageDecoder();
-    SkASSERT(creator);
-#if defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_NACL)
-    SkDEBUGCODE(creator = ) CreateGIFImageDecoder();
-    SkASSERT(creator);
-#endif
-}