diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp
index d912231..1561d31 100644
--- a/src/codec/SkAndroidCodec.cpp
+++ b/src/codec/SkAndroidCodec.cpp
@@ -162,6 +162,17 @@
 sk_sp<SkColorSpace> SkAndroidCodec::computeOutputColorSpace(SkColorType outputColorType,
                                                             sk_sp<SkColorSpace> prefColorSpace) {
     switch (outputColorType) {
+#ifdef SK_SUPPORT_LEGACY_ANDROID_CODEC_COLORSPACE
+        case kRGBA_F16_SkColorType:
+            // Note that |prefColorSpace| is ignored, F16 is always linear sRGB.
+            return SkColorSpace::MakeSRGBLinear();
+        case kRGB_565_SkColorType:
+            // Note that |prefColorSpace| is ignored, 565 is always sRGB.
+            return SkColorSpace::MakeSRGB();
+#else
+        case kRGBA_F16_SkColorType:
+        case kRGB_565_SkColorType:
+#endif
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType: {
             // If |prefColorSpace| is supplied, choose it.
@@ -184,12 +195,6 @@
 
             return SkColorSpace::MakeSRGB();
         }
-        case kRGBA_F16_SkColorType:
-            // Note that |prefColorSpace| is ignored, F16 is always linear sRGB.
-            return SkColorSpace::MakeSRGBLinear();
-        case kRGB_565_SkColorType:
-            // Note that |prefColorSpace| is ignored, 565 is always sRGB.
-            return SkColorSpace::MakeSRGB();
         default:
             // Color correction not supported for kGray.
             return nullptr;