diff options
| author | jbauman <jbauman@chromium.org> | 2016-01-22 14:27:40 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-22 22:28:44 +0000 |
| commit | 8d82e2ce2bc8d95fbfe53f6e7f98c345bba2de01 (patch) | |
| tree | 7038f37d2ba1074ffa335a876624c678c17a613a /gpu/gles2_conform_support | |
| parent | 0c72ca019601367749b284a69540a7bc233665c4 (diff) | |
| download | chromium_src-8d82e2ce2bc8d95fbfe53f6e7f98c345bba2de01.zip chromium_src-8d82e2ce2bc8d95fbfe53f6e7f98c345bba2de01.tar.gz chromium_src-8d82e2ce2bc8d95fbfe53f6e7f98c345bba2de01.tar.bz2 | |
Don't compile windowed egl into gles2_conform_test_windowless
The symbols from egl_native_win were overriding the windowless symbols, causing it to use a window instead.
BUG=none
Review URL: https://codereview.chromium.org/1592563002
Cr-Commit-Position: refs/heads/master@{#371058}
Diffstat (limited to 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/gles2_conform_support.gyp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index cfc6cc7..6e63493 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -12,17 +12,9 @@ 'native/main.cc', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="win"', { 'bootstrap_sources_native': [ 'native/egl_native.cc', - 'native/egl_native_aura.cc', - 'native/egl_native_x11.cc', - ], - }], - ['OS=="win"', { - 'bootstrap_sources_native': [ - 'native/egl_native.cc', - 'native/egl_native_win.cc', ], }], ], |