Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Unified Diff: gyp/tools.gyp

Issue 1422513003: SkTime::GetNSecs() (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: #else std::chrono Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | include/core/SkTime.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index c25543ef2d46bb269b91e81f349b69bafc3f078d..a4f8cfd62ab9ccea85060ad32dc63ec9fff9cb5e 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',
« no previous file with comments | « no previous file | include/core/SkTime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698