From 580501382fb1418fff7acc63680f3a9a6bf3938c Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Wed, 12 Jul 2017 22:10:29 -0400
Subject: Guard to remove kIndex_8_SkColorType

Bug: skia:6828
Change-Id: Ia942a36abb18213184f8d436555a658270d97d47
Reviewed-on: https://skia-review.googlesource.com/22721
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
---
 src/android/SkBitmapRegionCodec.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/android')

diff --git a/src/android/SkBitmapRegionCodec.cpp b/src/android/SkBitmapRegionCodec.cpp
index c4e1ea124c..52774bcfa0 100644
--- a/src/android/SkBitmapRegionCodec.cpp
+++ b/src/android/SkBitmapRegionCodec.cpp
@@ -57,7 +57,9 @@ bool SkBitmapRegionCodec::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocat
     SkImageInfo decodeInfo = SkImageInfo::Make(scaledSize.width(), scaledSize.height(),
                                                dstColorType, dstAlphaType, dstColorSpace);
 
+#ifdef SK_SUPPORT_LEGACY_INDEX_8_COLORTYPE
     SkASSERT(dstColorType != kIndex_8_SkColorType);
+#endif
 
     // Initialize the destination bitmap
     int scaledOutX = 0;
-- 
cgit v1.2.3