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

Side by Side Diff: gyp/bench.gyp

Issue 148473002: Revert of Workaround for assertion in NVPR config in bench. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « bench/HairlinePathBench.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # GYP file to build performance testbench. 1 # GYP file to build performance testbench.
2 # 2 #
3 { 3 {
4 'includes': [ 4 'includes': [
5 'apptype_console.gypi', 5 'apptype_console.gypi',
6 ], 6 ],
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'bench', 9 'target_name': 'bench',
10 'type': 'executable', 10 'type': 'executable',
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 '../bench/SkBenchmark.cpp', 98 '../bench/SkBenchmark.cpp',
99 '../bench/SkBenchmark.h', 99 '../bench/SkBenchmark.h',
100 '../bench/benchmain.cpp', 100 '../bench/benchmain.cpp',
101 ], 101 ],
102 'conditions': [ 102 'conditions': [
103 ['skia_gpu == 1', 103 ['skia_gpu == 1',
104 { 104 {
105 'include_dirs' : [ 105 'include_dirs' : [
106 '../src/gpu', 106 '../src/gpu',
107 ], 107 ],
108 'dependencies': [
109 'gputest.gyp:skgputest',
110 ],
111 }, 108 },
112 ], 109 ],
113 ], 110 ],
114 }, 111 },
115 { 112 {
116 'target_name' : 'bench_timer', 113 'target_name' : 'bench_timer',
117 'type': 'static_library', 114 'type': 'static_library',
118 'sources': [ 115 'sources': [
119 '../bench/BenchTimer.h', 116 '../bench/BenchTimer.h',
120 '../bench/BenchTimer.cpp', 117 '../bench/BenchTimer.cpp',
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 ['skia_gpu == 1', { 158 ['skia_gpu == 1', {
162 'sources': [ 159 'sources': [
163 '../bench/BenchGpuTimer_gl.h', 160 '../bench/BenchGpuTimer_gl.h',
164 '../bench/BenchGpuTimer_gl.cpp', 161 '../bench/BenchGpuTimer_gl.cpp',
165 ], 162 ],
166 }], 163 }],
167 ], 164 ],
168 } 165 }
169 ], 166 ],
170 } 167 }
OLDNEW
« no previous file with comments | « bench/HairlinePathBench.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698