Individually enable and disable SkCodecs

src/codec/SkAndroidCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAndroidCodec.h"
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
-#ifdef SK_CODEC_DECODES_RAW
 #include "SkRawAdapterCodec.h"
-#endif
 #include "SkSampledCodec.h"
 #include "SkWebpAdapterCodec.h"
 
 static bool is_valid_sample_size(int sampleSize) {
     // FIXME: As Leon has mentioned elsewhere, surely there is also a maximum sampleSize?
     return sampleSize > 0;
 }
 
 SkAndroidCodec::SkAndroidCodec(SkCodec* codec)
     : fInfo(codec->getInfo())
     , fCodec(codec)
 {}
 
 SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader* chunkReader) {
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream, chunkReader));
     if (nullptr == codec) {
         return nullptr;
     }
 
     switch (codec->getEncodedFormat()) {
+#ifdef SK_CODEC_DECODES_PNG
+        case kPNG_SkEncodedFormat:
+        case kICO_SkEncodedFormat:
+#endif
+#ifdef SK_CODEC_DECODES_JPEG
+        case kJPEG_SkEncodedFormat:
+#endif
+#ifdef SK_CODEC_DECODES_GIF
+        case kGIF_SkEncodedFormat:
+#endif
+        case kBMP_SkEncodedFormat:
+        case kWBMP_SkEncodedFormat:
+            return new SkSampledCodec(codec.detach());
+#ifdef SK_CODEC_DECODES_WEBP
         case kWEBP_SkEncodedFormat:
             return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach());
-        case kPNG_SkEncodedFormat:
-        case kJPEG_SkEncodedFormat:
-        case kWBMP_SkEncodedFormat:
-        case kBMP_SkEncodedFormat:
-        case kGIF_SkEncodedFormat:
-        case kICO_SkEncodedFormat:
-            return new SkSampledCodec(codec.detach());
+#endif
 #ifdef SK_CODEC_DECODES_RAW
         case kRAW_SkEncodedFormat:
             return new SkRawAdapterCodec((SkRawCodec*)codec.detach());
 #endif
         default:
             return nullptr;
     }
 }
 
 SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data, SkPngChunkReader* chunkReader) {
@@ skipping 129 matching lines @@
         }
     }
 
     return this->onGetAndroidPixels(info, pixels, rowBytes, *options);
 }
 
 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels,
         size_t rowBytes) {
     return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
 }