Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # GYP file to build unit tests. | 1 # GYP file to build unit tests. |
| 2 { | 2 { |
| 3 'includes': [ | 3 'includes': [ |
| 4 'apptype_console.gypi', | 4 'apptype_console.gypi', |
| 5 ], | 5 ], |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'tests', | 8 'target_name': 'tests', |
| 9 'type': 'executable', | 9 'type': 'executable', |
| 10 'includes': [ | 10 'includes': [ |
| 11 'pathops_unittest.gypi', | 11 'pathops_unittest.gypi', |
| 12 'tests.gypi', | 12 'tests.gypi', |
| 13 ], | 13 ], |
| 14 'sources': [ | 14 'sources': [ |
| 15 '../tests/skia_test.cpp', | 15 '../tests/skia_test.cpp', |
| 16 ], | 16 ], |
| 17 'conditions': [ | 17 'conditions': [ |
| 18 [ 'skia_android_framework == 1', { | |
| 19 'libraries': [ | |
| 20 '-lskia', | |
| 21 '-lcutils', | |
| 22 'stlport_static.a', | |
|
djsollen
2014/04/28 13:52:23
are we sure that is the right way to include stlpo
scroggo
2014/04/28 14:37:24
This matches what the makefile already stated.
| |
| 23 ], | |
| 24 'libraries!': [ | |
| 25 '-lz', | |
| 26 '-llog', | |
| 27 ], | |
| 28 }], | |
| 18 [ 'skia_gpu == 1', { | 29 [ 'skia_gpu == 1', { |
| 19 'include_dirs': [ | 30 'include_dirs': [ |
| 20 '../src/gpu', | 31 '../src/gpu', |
| 21 ], | 32 ], |
| 22 }], | 33 }], |
| 23 ], | 34 ], |
| 24 }, | 35 }, |
| 25 ], | 36 ], |
| 26 } | 37 } |
| OLD | NEW |