Support decoding subsets from JPG on Android.

tests/ImageDecodingTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
@@ skipping 207 matching lines @@
     }
     return SkNEW_ARGS(SkMemoryStream, (data.get()));
 }
 
 // For every format that supports tile based decoding, ensure that
 // calling decodeSubset will not fail if the caller has unreffed the
 // stream provided in buildTileIndex.
 // 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
+#ifdef SK_BUILD_FOR_ANDROID
         SkImageEncoder::kJPEG_Type,
-#endif
-#ifdef SK_BUILD_FOR_ANDROID
         SkImageEncoder::kPNG_Type,
 #endif
         SkImageEncoder::kWEBP_Type,
     };
     for (size_t i = 0; i < SK_ARRAY_COUNT(gTypes); ++i) {
         SkDebugf("encoding to %i\n", i);
         SkAutoTUnref<SkStream> stream(create_image_stream(gTypes[i]));
         if (NULL == stream.get()) {
             SkDebugf("no stream\n");
             continue;
@@ skipping 21 matching lines @@
     test_unpremul(reporter);
     test_pref_config_table(reporter);
 #ifdef SK_DEBUG
     test_stream_life();
 #endif
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("ImageDecoding", ImageDecodingTestClass,
                  test_imageDecodingTests)