gather GM tests which are disabled on Android

BUG=skia:2326
R=borenet@google.com, djsollen@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/208313014

git-svn-id: http://skia.googlecode.com/svn/trunk@13922 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/androidfallback.cpp

@@ -35,11 +35,9 @@ protected:
         paint.setTextEncoding(SkPaint::kUTF16_TextEncoding);
         paint.setTextSize(24);
 
-#ifdef SK_BUILD_FOR_ANDROID
         SkPaintOptionsAndroid options = paint.getPaintOptionsAndroid();
         options.setUseFontFallbacks(true);
         paint.setPaintOptionsAndroid(options);
-#endif
 
         // "א foo 免舌 bar क"
         const uint16_t unicodeStr[] = {0x05D0, 0x0020, 0x0066, 0x006F, 0x006F, 0x0020, 0x514D,
@@ -63,10 +61,8 @@ protected:
         canvas->translate(0, SkIntToScalar(75));
         canvas->drawPosTextH(unicodeStr, strByteLength, posX, 0, paint);
 
-#ifdef SK_BUILD_FOR_ANDROID
         options.setLanguage("ja");
         paint.setPaintOptionsAndroid(options);
-#endif
 
         canvas->translate(0, SkIntToScalar(75));
         canvas->drawPosText(unicodeStr, strByteLength, posXY, paint);
@@ -85,8 +81,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_BUILD_FOR_ANDROID
 DEF_GM( return SkNEW(AndroidFallbackGM); )
-#endif
 
 }

gm/bitmapcopy.cpp

@@ -121,8 +121,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-#ifndef SK_BUILD_FOR_ANDROID
 static GM* MyFactory(void*) { return new BitmapCopyGM; }
 static GMRegistry reg(MyFactory);
-#endif
 }

gm/coloremoji.cpp

@@ -109,10 +109,7 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-#if !defined(SK_BUILD_FOR_ANDROID)
-// fail for now until the appropriate freetype changes are submitted
 static GM* MyFactory(void*) { return new ColorEmojiGM; }
 static GMRegistry reg(MyFactory);
-#endif
 
 }

gm/drawbitmaprect.cpp

@@ -178,8 +178,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-#ifndef SK_BUILD_FOR_ANDROID
 static GM* MyFactory(void*) { return new DrawBitmapRectGM; }
 static GMRegistry reg(MyFactory);
-#endif
 }

gm/shadertext.cpp

@@ -207,8 +207,6 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef SK_BUILD_FOR_ANDROID
 static GM* MyFactory(void*) { return new ShaderTextGM; }
 static GMRegistry reg(MyFactory);
-#endif
 }

gm/shadertext2.cpp

@@ -214,8 +214,6 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef SK_BUILD_FOR_ANDROID
 static GM* MyFactory(void*) { return new ShaderText2GM; }
 static GMRegistry reg(MyFactory);
-#endif
 }

gm/shadertext3.cpp

@@ -136,8 +136,6 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef SK_BUILD_FOR_ANDROID
 static GM* MyFactory(void*) { return new ShaderText3GM; }
 static GMRegistry reg(MyFactory);
-#endif
 }

gm/verylargebitmap.cpp

@@ -119,8 +119,5 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-// This GM allocates more memory than Android devices are capable of fulfilling.
-#ifndef SK_BUILD_FOR_ANDROID
 static skiagm::GM* MyFactory(void*) { return new VeryLargeBitmapGM; }
 static skiagm::GMRegistry reg(MyFactory);
-#endif

gyp/gmslides.gypi

@@ -15,7 +15,6 @@
     '../gm/aaclip.cpp',
     '../gm/aarectmodes.cpp',
     '../gm/alphagradients.cpp',
-    '../gm/androidfallback.cpp',
     '../gm/arcofzorro.cpp',
     '../gm/arithmode.cpp',
     '../gm/beziereffects.cpp',
@@ -185,14 +184,43 @@
     '../src/utils/debugger/SkObjectParser.cpp',
 
   ],
-  # TODO(epoger): Disabling while we investigate http://skbug.com/2313
-  # epoger will re-enable by 10 April 2014
   'conditions': [
+    # TODO: Several GMs are known to cause particular problems on Android, so
+    # we disable them on Android.  See http://skbug.com/2326
     [ 'skia_os == "android"', {
       'sources!': [
+        # TODO(borenet): Causes assertion failure on Nexus S.
+        # See http://skbug.com/705
+        '../gm/bitmapcopy.cpp',
+
+        # SOME of the bitmaprect tests are disabled on Android; see
+        # ../gm/bitmaprect.cpp
+
+        # Fail for now until the appropriate freetype changes are submitted.
+        '../gm/coloremoji.cpp',
+
+        # We skip GPU tests in this GM; see
+        # ../gm/deviceproperties.cpp
+
+        # TODO(bsalomon): Hangs on Xoom and Nexus S. See http://skbug.com/637
+        '../gm/drawbitmaprect.cpp',
+
+        # TODO(epoger): Crashes on Nexus 10. See http://skbug.com/2313
         '../gm/imagefilterscropexpand.cpp',
+
+        # TODO(borenet): Causes Nexus S to reboot. See http://skbug.com/665
+        '../gm/shadertext.cpp',
+        '../gm/shadertext2.cpp',
+        '../gm/shadertext3.cpp',
+
+        # TODO(reed): Allocates more memory than Android devices are capable of
+        # fulfilling. See http://skbug.com/1978
+        '../gm/verylargebitmap.cpp',
+      ],
+
+      'sources': [
+        '../gm/androidfallback.cpp',
       ],
     }],
-    # base class for GMs
   ],
 }