commit 9ac68ee2594f28dfc1bd16a4bf004b1a4f6f228d
author mtklein <mtklein@chromium.org> Fri Jun 20 11:29:20 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jun 20 11:29:21 2014 -0700
tree 01874abc7df6a4840e9b1763e156842c7faba0c2
parent 24480bc71ef6c754030cb3f98672da1c8fb3a63b

Move BenchTimer to tools as Timer

This breaks a bunch of circular dependencies between tools and gm and bench.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed

CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Mac10.7-Clang-Arm7-Debug-iOS-Trybot,Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot
R=tfarina@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/344213003

gyp/SampleApp.gyp

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index abfc8b7..9ced81b 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -150,8 +150,8 @@
         'flags.gyp:flags',
         'lua.gyp:lua',
         'pdf.gyp:pdf',
-        'resources.gyp:resources',
         'skia_lib.gyp:skia_lib',
+        'tools.gyp:resources',
         'views.gyp:views',
         'views_animated.gyp:views_animated',
         'xml.gyp:xml',