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/bench.gyp

Issue 303913002: In Android framework, make tools depend on jsoncpp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase, cleanups. Created 6 years, 6 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
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 21 matching lines...) Expand all
32 ], 32 ],
33 'dependencies': [ 33 'dependencies': [
34 'gputest.gyp:skgputest', 34 'gputest.gyp:skgputest',
35 ], 35 ],
36 }, 36 },
37 ], 37 ],
38 ['skia_android_framework == 1', 38 ['skia_android_framework == 1',
39 { 39 {
40 'libraries': [ 40 'libraries': [
41 '-lskia', 41 '-lskia',
42 'jsoncpp.a',
42 ], 43 ],
43 }, 44 },
44 ], 45 ],
45 ], 46 ],
46 'includes': [ 47 'includes': [
47 'bench.gypi', 48 'bench.gypi',
48 'gmslides.gypi', 49 'gmslides.gypi',
49 ], 50 ],
50 }, 51 },
51 { 52 {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ['skia_gpu == 1', { 102 ['skia_gpu == 1', {
102 'sources': [ 103 'sources': [
103 '../bench/BenchGpuTimer_gl.h', 104 '../bench/BenchGpuTimer_gl.h',
104 '../bench/BenchGpuTimer_gl.cpp', 105 '../bench/BenchGpuTimer_gl.cpp',
105 ], 106 ],
106 }], 107 }],
107 ], 108 ],
108 } 109 }
109 ], 110 ],
110 } 111 }
OLDNEW
« no previous file with comments | « gm/gmmain.cpp ('k') | gyp/common_conditions.gypi » ('j') | gyp/gm.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698