Display JPGs in Viewer with Split Screen and ColorSpaceXform

tools/viewer/sk_app/android/RasterWindowContext_android.cpp

Index: tools/viewer/sk_app/android/RasterWindowContext_android.cpp
diff --git a/tools/viewer/sk_app/android/RasterWindowContext_android.cpp b/tools/viewer/sk_app/android/RasterWindowContext_android.cpp
index 3ba564635e2da2aeca87af682d3c6846e6185938..5e1e351b9ae0593311f68cf423b50648ea67acf5 100644
--- a/tools/viewer/sk_app/android/RasterWindowContext_android.cpp
+++ b/tools/viewer/sk_app/android/RasterWindowContext_android.cpp
@@ -36,7 +36,7 @@ RasterWindowContext_android::RasterWindowContext_android(
 }
 
 void RasterWindowContext_android::setBuffersGeometry() {
-    int32_t format;
+    int32_t format = 0;
     switch(fDisplayParams.fColorType) {
         case kRGBA_8888_SkColorType:
             format = WINDOW_FORMAT_RGBA_8888;
@@ -45,7 +45,7 @@ void RasterWindowContext_android::setBuffersGeometry() {
             format = WINDOW_FORMAT_RGB_565;
             break;
         default:
-            SkDEBUGFAIL("Unsupported Android color type");
+            SK_ABORT("Unsupported Android color type");
     }
     ANativeWindow_setBuffersGeometry(fNativeWindow, fWidth, fHeight, format);
 }