Commit 05a49f68 by Jamie Madill

Fix doubly defined variables in libANGLE and libGLESv2.

We can get by with only including these in libANGLE, since libGLESv2 pulls in libANGLE. BUG=angle:773 Change-Id: Iccbdb968b3c55528e2a7e1dd55f4f1280a70bfe9 Reviewed-on: https://chromium-review.googlesource.com/232967Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org>
parent 3011c25b
...@@ -561,11 +561,8 @@ ...@@ -561,11 +561,8 @@
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': 'sources':
[ [
'common/angleutils.cpp',
'common/angleutils.h', 'common/angleutils.h',
'common/debug.cpp',
'common/debug.h', 'common/debug.h',
'common/tls.cpp',
'common/tls.h', 'common/tls.h',
'libGLESv2/libGLESv2.cpp', 'libGLESv2/libGLESv2.cpp',
'libGLESv2/libGLESv2.def', 'libGLESv2/libGLESv2.def',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment