diff options
| author |  mtklein <mtklein@chromium.org> | 2015-10-23 06:24:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-23 06:24:07 -0700 |
| commit | 38a88e4c0c28a7be981aac7bb4a198ad95a62a63 (patch) | |
| tree | 4f16d9ae0e87bba56e75aba448482f62a58e29c4 /gyp | |
| parent | 5a06df46864f010befaf8c57af1801fb43cbea86 (diff) | |
SkTime::GetNSecs()
- Move high-precision wall timers from tools/timer to SkTime.
- Implement SkTime::GetMSecs() in terms of SkTime::GetNSecs().
- Delete unused tools/timer code.
I have no idea what's going on there in src/animator.
I don't intend to investigate.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/70084cbc16ee8162649f2601377feb6e49de0217
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link-Trybot
Committed: https://skia.googlesource.com/skia/+/a1840d50e29fd95e4df2d1168fe54c34c2a5c30c
Review URL: https://codereview.chromium.org/1422513003
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/tools.gyp | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index c25543ef2d..a4f8cfd62a 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -132,39 +132,11 @@ { 'target_name' : 'timer', 'type': 'static_library', - 'sources': [ - '../tools/timer/Timer.cpp', - '../tools/timer/TimerData.cpp', - ], - 'include_dirs': [ - '../include/private', - '../src/core', - '../src/gpu', - ], + 'sources': [ '../tools/timer/Timer.cpp' ], 'direct_dependent_settings': { 'include_dirs': ['../tools/timer'], }, - 'dependencies': [ - 'skia_lib.gyp:skia_lib', - 'jsoncpp.gyp:jsoncpp', - ], - 'conditions': [ - ['skia_gpu == 1', { - 'sources': [ '../tools/timer/GpuTimer.cpp' ], - }], - [ 'skia_os in ["mac", "ios"]', { - 'sources': [ '../tools/timer/SysTimer_mach.cpp' ], - }], - [ 'skia_os == "win"', { - 'sources': [ '../tools/timer/SysTimer_windows.cpp' ], - }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "chromeos"]', { - 'sources': [ '../tools/timer/SysTimer_posix.cpp' ], - }], - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { - 'link_settings': { 'libraries': [ '-lrt' ] }, - }], - ], + 'dependencies': [ 'skia_lib.gyp:skia_lib' ], }, { 'target_name': 'skdiff', |