| OLD | NEW |
| 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 15 matching lines...) Expand all Loading... |
| 26 ['skia_gpu == 1', | 26 ['skia_gpu == 1', |
| 27 { | 27 { |
| 28 'include_dirs' : [ | 28 'include_dirs' : [ |
| 29 '../src/gpu', | 29 '../src/gpu', |
| 30 ], | 30 ], |
| 31 'dependencies': [ | 31 'dependencies': [ |
| 32 'gputest.gyp:skgputest', | 32 'gputest.gyp:skgputest', |
| 33 ], | 33 ], |
| 34 }, | 34 }, |
| 35 ], | 35 ], |
| 36 ['skia_android_framework == 1', |
| 37 { |
| 38 'libraries': [ |
| 39 '-lskia', |
| 40 '-lcutils', |
| 41 ], |
| 42 # FIXME (scroggo): JSON is disabled in Android framework until we |
| 43 # solve skbug.com/2448 |
| 44 'dependencies!' : [ |
| 45 'jsoncpp.gyp:jsoncpp', |
| 46 ], |
| 47 }, |
| 48 ], |
| 36 ], | 49 ], |
| 37 'includes': [ | 50 'includes': [ |
| 38 'bench.gypi', | 51 'bench.gypi', |
| 39 'gmslides.gypi', | 52 'gmslides.gypi', |
| 40 ], | 53 ], |
| 41 }, | 54 }, |
| 42 { | 55 { |
| 43 'target_name' : 'bench_timer', | 56 'target_name' : 'bench_timer', |
| 44 'type': 'static_library', | 57 'type': 'static_library', |
| 45 'sources': [ | 58 'sources': [ |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 ['skia_gpu == 1', { | 105 ['skia_gpu == 1', { |
| 93 'sources': [ | 106 'sources': [ |
| 94 '../bench/BenchGpuTimer_gl.h', | 107 '../bench/BenchGpuTimer_gl.h', |
| 95 '../bench/BenchGpuTimer_gl.cpp', | 108 '../bench/BenchGpuTimer_gl.cpp', |
| 96 ], | 109 ], |
| 97 }], | 110 }], |
| 98 ], | 111 ], |
| 99 } | 112 } |
| 100 ], | 113 ], |
| 101 } | 114 } |
| OLD | NEW |