Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # GYP for building gpu | 1 # GYP for building gpu |
| 2 { | 2 { |
| 3 'target_defaults': { | 3 'target_defaults': { |
| 4 'conditions': [ | 4 'conditions': [ |
| 5 ['skia_os != "win"', { | 5 ['skia_os != "win"', { |
| 6 'sources/': [ ['exclude', '_win.(h|cpp)$'], | 6 'sources/': [ ['exclude', '_win.(h|cpp)$'], |
| 7 ], | 7 ], |
| 8 }], | 8 }], |
| 9 ['skia_os != "mac"', { | 9 ['skia_os != "mac"', { |
| 10 'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'], | 10 'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'], |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 208 }, { # not skia_angle | 208 }, { # not skia_angle |
| 209 'sources!': [ | 209 'sources!': [ |
| 210 '<@(skgpu_angle_gl_sources)', | 210 '<@(skgpu_angle_gl_sources)', |
| 211 ], | 211 ], |
| 212 }], | 212 }], |
| 213 [ 'skia_os == "android"', { | 213 [ 'skia_os == "android"', { |
| 214 'sources!': [ | 214 'sources!': [ |
| 215 '../src/gpu/gl/GrGLDefaultInterface_none.cpp', | 215 '../src/gpu/gl/GrGLDefaultInterface_none.cpp', |
| 216 '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', | 216 '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', |
| 217 ], | 217 ], |
| 218 'defines': [ | |
| 219 'GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1', | |
|
borenet
2014/07/08 20:04:12
Is there a source change to go along with this?
djsollen
2014/07/08 20:14:46
Nope. The new NDK toolchain has updated header fil
| |
| 220 ], | |
| 218 'link_settings': { | 221 'link_settings': { |
| 219 'libraries': [ | 222 'libraries': [ |
| 220 '-lGLESv2', | 223 '-lGLESv2', |
| 221 '-lEGL', | 224 '-lEGL', |
| 222 ], | 225 ], |
| 223 }, | 226 }, |
| 224 }], | 227 }], |
| 225 ], | 228 ], |
| 226 }, | 229 }, |
| 227 ], | 230 ], |
| 228 } | 231 } |
| OLD | NEW |