Provide static global initializers for SkColorTable and SkComposeShader.

This makes some GMs which were broken on Android work. Reenable them on
Android.

Also fix a typo in gmmain.
Review URL: https://codereview.appspot.com/6344069

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

1 files changed, 0 insertions, 6 deletions

diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index 3b563dd53b..92c7b43dbb 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -101,12 +101,6 @@ protected:
         return SkString("bitmapfilters");
     }
 
-#ifdef SK_BUILD_FOR_ANDROID
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
-        return this->INHERITED::onGetFlags() | GM::kSkipPipe_Flag;
-    }
-#endif
-
 	virtual SkISize onISize() {
         return make_isize(540, 330);
     }