diff options
| author |  mtklein <mtklein@google.com> | 2015-10-22 17:49:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-22 17:49:22 -0700 |
| commit | 5a06df46864f010befaf8c57af1801fb43cbea86 (patch) | |
| tree | 2076a03c9e01fe3146e64755f54684abd3ea9497 /gyp | |
| parent | a1840d50e29fd95e4df2d1168fe54c34c2a5c30c (diff) | |
Revert of SkTime::GetNSecs() (patchset #10 id:180001 of https://codereview.chromium.org/1422513003/ )
Reason for revert:
https://codereview.chromium.org/1412453006
Original issue's description:
> 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
TBR=caryclark@google.com,reed@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1417753003
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gyp | 1 | ||||
| -rw-r--r-- | gyp/tools.gyp | 32 |
2 files changed, 30 insertions, 3 deletions
diff --git a/gyp/core.gyp b/gyp/core.gyp index 5a46005678..2569a9478f 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -40,7 +40,6 @@ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 'link_settings': { 'libraries': [ - '-lrt', '-lpthread', ], }, diff --git a/gyp/tools.gyp b/gyp/tools.gyp index a4f8cfd62a..c25543ef2d 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -132,11 +132,39 @@ { 'target_name' : 'timer', 'type': 'static_library', - 'sources': [ '../tools/timer/Timer.cpp' ], + 'sources': [ + '../tools/timer/Timer.cpp', + '../tools/timer/TimerData.cpp', + ], + 'include_dirs': [ + '../include/private', + '../src/core', + '../src/gpu', + ], 'direct_dependent_settings': { 'include_dirs': ['../tools/timer'], }, - 'dependencies': [ 'skia_lib.gyp:skia_lib' ], + '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' ] }, + }], + ], }, { 'target_name': 'skdiff', |