Index: src/codec/SkCodec.cpp |
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp |
index c24bb548baaaa712b5c5286a34d188175414ff1d..93db0e58eec0aea9c0b4d80354b671f1c80a225b 100644 |
--- a/src/codec/SkCodec.cpp |
+++ b/src/codec/SkCodec.cpp |
@@ -13,9 +13,7 @@ |
#include "SkCodec_libpng.h" |
#include "SkCodec_wbmp.h" |
#include "SkCodecPriv.h" |
-#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK |
#include "SkJpegCodec.h" |
-#endif |
#include "SkStream.h" |
#include "SkWebpCodec.h" |
@@ -26,9 +24,7 @@ |
static const DecoderProc gDecoderProcs[] = { |
{ SkPngCodec::IsPng, SkPngCodec::NewFromStream }, |
-#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK |
{ SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream }, |
-#endif |
{ SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream }, |
{ SkGifCodec::IsGif, SkGifCodec::NewFromStream }, |
{ SkIcoCodec::IsIco, SkIcoCodec::NewFromStream }, |