Index: gyp/gmslides.gypi |
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi |
index 1927ff2a1ae6e0bf724f732a60d8bf8ff9411938..23c880694cefa289e69f3e5ed08741201adc2b9d 100644 |
--- a/gyp/gmslides.gypi |
+++ b/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 |
], |
} |