You also need to remove SkRectShape.cpp and references to shapes in SkGlobalInitialization_default.cpp
done
ptal
lgtm! You get a gold star for deleting that much code.