diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-26 17:23:52 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-26 17:23:52 +0000 |
| commit | 0682ca6971326a293285c1c90c9ef2fbbc54a4f3 (patch) | |
| tree | fae2207a4e98f04a3bdc1a8a4baeaf22c5a1de80 /gm/fontscaler.cpp | |
| parent | 3b429984664e88e0530eb6a1461a828898d8d96b (diff) | |
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
Diffstat (limited to 'gm/fontscaler.cpp')
| -rw-r--r-- | gm/fontscaler.cpp | 4 |
1 files 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 + } |