Fix BGRA readback on Android

tests/PremulAlphaRoundTripTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "SkCanvas.h"
@@ skipping 18 matching lines @@
     for (int a = 0; a < 256; ++a) {
         for (int r = 0; r < 256; ++r) {
             pixels[a * 256 + r] = SkPackConfig8888(unpremulConfig, a, r, 0, 0);
         }
     }
     canvas->writePixels(bmp, 0, 0, unpremulConfig);
 }
 
 static const SkCanvas::Config8888 gUnpremulConfigs[] = {
     SkCanvas::kNative_Unpremul_Config8888,
-/**
- * There is a bug in Ganesh (http://code.google.com/p/skia/issues/detail?id=438)
- * that causes the readback of pixels from BGRA canvas to an RGBA bitmap to
- * fail. This should be removed as soon as the issue above is resolved.
- */
-#if !defined(SK_BUILD_FOR_ANDROID)
     SkCanvas::kBGRA_Unpremul_Config8888,
-#endif
     SkCanvas::kRGBA_Unpremul_Config8888,
 };
 
 void PremulAlphaRoundTripTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
     SkAutoTUnref<SkDevice> device;
     for (int dtype = 0; dtype < 2; ++dtype) {
 
         int glCtxTypeCnt = 1;
 #if SK_SUPPORT_GPU
         if (0 != dtype)  {
@@ skipping 61 matching lines @@
                     }
                 }
             }
         }
     }
 }
 }
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("PremulAlphaRoundTripTest", PremulAlphaRoundTripTestClass, PremulAlphaRoundTripTest)