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

Side by Side Diff: gyp/tools.gyp

Issue 1420923003: Revert of SkTime::GetNSecs() (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | include/core/SkTime.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # GYP file to build various tools. 5 # GYP file to build various tools.
6 # 6 #
7 # To build on Linux: 7 # To build on Linux:
8 # ./gyp_skia tools.gyp && make tools 8 # ./gyp_skia tools.gyp && make tools
9 # 9 #
10 { 10 {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 'flags.gyp:flags', 125 'flags.gyp:flags',
126 'skia_lib.gyp:skia_lib', 126 'skia_lib.gyp:skia_lib',
127 ], 127 ],
128 'direct_dependent_settings': { 128 'direct_dependent_settings': {
129 'include_dirs': [ '../tools', ], 129 'include_dirs': [ '../tools', ],
130 }, 130 },
131 }, 131 },
132 { 132 {
133 'target_name' : 'timer', 133 'target_name' : 'timer',
134 'type': 'static_library', 134 'type': 'static_library',
135 'sources': [ '../tools/timer/Timer.cpp' ], 135 'sources': [
136 '../tools/timer/Timer.cpp',
137 '../tools/timer/TimerData.cpp',
138 ],
139 'include_dirs': [
140 '../include/private',
141 '../src/core',
142 '../src/gpu',
143 ],
136 'direct_dependent_settings': { 144 'direct_dependent_settings': {
137 'include_dirs': ['../tools/timer'], 145 'include_dirs': ['../tools/timer'],
138 }, 146 },
139 'dependencies': [ 'skia_lib.gyp:skia_lib' ], 147 'dependencies': [
148 'skia_lib.gyp:skia_lib',
149 'jsoncpp.gyp:jsoncpp',
150 ],
151 'conditions': [
152 ['skia_gpu == 1', {
153 'sources': [ '../tools/timer/GpuTimer.cpp' ],
154 }],
155 [ 'skia_os in ["mac", "ios"]', {
156 'sources': [ '../tools/timer/SysTimer_mach.cpp' ],
157 }],
158 [ 'skia_os == "win"', {
159 'sources': [ '../tools/timer/SysTimer_windows.cpp' ],
160 }],
161 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "chr omeos"]', {
162 'sources': [ '../tools/timer/SysTimer_posix.cpp' ],
163 }],
164 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
165 'link_settings': { 'libraries': [ '-lrt' ] },
166 }],
167 ],
140 }, 168 },
141 { 169 {
142 'target_name': 'skdiff', 170 'target_name': 'skdiff',
143 'type': 'executable', 171 'type': 'executable',
144 'sources': [ 172 'sources': [
145 '../tools/skdiff.cpp', 173 '../tools/skdiff.cpp',
146 '../tools/skdiff.h', 174 '../tools/skdiff.h',
147 '../tools/skdiff_html.cpp', 175 '../tools/skdiff_html.cpp',
148 '../tools/skdiff_html.h', 176 '../tools/skdiff_html.h',
149 '../tools/skdiff_main.cpp', 177 '../tools/skdiff_main.cpp',
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 'flags.gyp:flags', 761 'flags.gyp:flags',
734 'skia_lib.gyp:skia_lib', 762 'skia_lib.gyp:skia_lib',
735 'resources', 763 'resources',
736 ], 764 ],
737 }, 765 },
738 ], 766 ],
739 }, 767 },
740 ], 768 ],
741 ], 769 ],
742 } 770 }
OLDNEW
« 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