From 0682ca6971326a293285c1c90c9ef2fbbc54a4f3 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Tue, 26 Jun 2012 17:23:52 +0000 Subject: Re-enable gm fontscaler for Android This was fixed in 4.1, and we're upgrading the bots since no non-beta client uses 4.0. Review URL: https://codereview.appspot.com/6334058 git-svn-id: http://skia.googlecode.com/svn/trunk@4342 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/fontscaler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp index b5a0174099..b331bde830 100644 --- a/gm/fontscaler.cpp +++ b/gm/fontscaler.cpp @@ -85,9 +85,9 @@ private: }; ////////////////////////////////////////////////////////////////////////////// -#ifndef SK_BUILD_FOR_ANDROID + static GM* MyFactory(void*) { return new FontScalerGM; } static GMRegistry reg(MyFactory); -#endif + } -- cgit v1.2.3