Fix BGRA readback on Android

tests/ReadPixelsTest.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 327 matching lines @@
 #else
                 continue;
 #endif
             }
             SkCanvas canvas(device);
             fillCanvas(&canvas);
 
             static const SkCanvas::Config8888 gReadConfigs[] = {
                 SkCanvas::kNative_Premul_Config8888,
                 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_Premul_Config8888,
                 SkCanvas::kBGRA_Unpremul_Config8888,
-#endif
+
                 SkCanvas::kRGBA_Premul_Config8888,
                 SkCanvas::kRGBA_Unpremul_Config8888,
             };
             for (size_t rect = 0; rect < SK_ARRAY_COUNT(testRects); ++rect) {
                 const SkIRect& srcRect = testRects[rect];
                 for (BitmapInit bmi = kFirstBitmapInit;
                      bmi < kBitmapInitCnt;
                      bmi = nextBMI(bmi)) {
                     for (size_t c = 0; c < SK_ARRAY_COUNT(gReadConfigs); ++c) {
                         SkCanvas::Config8888 config8888 = gReadConfigs[c];
@@ skipping 44 matching lines @@
                     }
                 }
             }
         }
     }
 }
 }
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("ReadPixels", ReadPixelsTestClass, ReadPixelsTest)