| Index: gm/gm.cpp
 | 
| diff --git a/gm/gm.cpp b/gm/gm.cpp
 | 
| index 8da45c5fcb165903ca4d1a10dba756eba5ec6ca2..57c5c5ded64bfeae76a10bbb56d1d55d83a5c3cc 100644
 | 
| --- a/gm/gm.cpp
 | 
| +++ b/gm/gm.cpp
 | 
| @@ -9,8 +9,6 @@
 | 
|  
 | 
|  using namespace skiagm;
 | 
|  
 | 
| -const char* GM::gResourcePath;
 | 
| -
 | 
|  GM::GM() {
 | 
|      fMode = kGM_Mode;
 | 
|      fBGColor = SK_ColorWHITE;
 | 
| @@ -66,13 +64,5 @@ void GM::drawSizeBounds(SkCanvas* canvas, SkColor color) {
 | 
|      canvas->drawRect(r, paint);
 | 
|  }
 | 
|  
 | 
| -void GM::SetResourcePath(const char* resourcePath) {
 | 
| -    gResourcePath = resourcePath;
 | 
| -}
 | 
| -
 | 
| -SkString GM::GetResourcePath() {
 | 
| -    return SkString(gResourcePath);
 | 
| -}
 | 
| -
 | 
|  // need to explicitly declare this, or we get some weird infinite loop llist
 | 
| -template GMRegistry* SkTRegistry<GM*(*)(void*)>::gHead;
 | 
| +template GMRegistry* GMRegistry::gHead;
 | 
| 
 |