Support decoding subsets from JPG on Android.
Previously we only supported it for the framework. Making this
change allows us to test subset decoding in skimage, to make sure
we don't break it.
Will require rebaselining android skimage results.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/21612003
git-svn-id: http://skia.googlecode.com/svn/trunk@10625 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index 2cf3e52..afab02f 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -225,10 +225,8 @@
// Only runs in debug mode since we are testing for a crash.
static void test_stream_life() {
const SkImageEncoder::Type gTypes[] = {
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
- SkImageEncoder::kJPEG_Type,
-#endif
#ifdef SK_BUILD_FOR_ANDROID
+ SkImageEncoder::kJPEG_Type,
SkImageEncoder::kPNG_Type,
#endif
SkImageEncoder::kWEBP_Type,