summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2014-07-01 16:19:45 +0200
committerMichael Bruning <michael.bruning@digia.com>2014-07-01 16:39:43 +0200
commit622cb04cc077a10d04c46798af8d132811ac9de3 (patch)
tree0c7caaf21ef605277af443483f45052d8af9a546
parent6ce870ab779829642c6a9e63e006894e8a3bb706 (diff)
downloadqtwebengine-chromium-622cb04cc077a10d04c46798af8d132811ac9de3.tar.gz
<third_party/angle> Disable building libEGL.dll and libGLESv2.dll.
This is part of using the ANGLE that is built / installed by Qt. Change-Id: Ib71d47392690dab6cf874aec13db9e98710de684 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--chromium/third_party/angle/src/build_angle.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/angle/src/build_angle.gypi b/chromium/third_party/angle/src/build_angle.gypi
index d87ff4e6860..274e65c043b 100644
--- a/chromium/third_party/angle/src/build_angle.gypi
+++ b/chromium/third_party/angle/src/build_angle.gypi
@@ -212,7 +212,7 @@
},
],
'conditions': [
- ['OS=="win"', {
+ ['OS=="win" and use_qt==0', {
'targets': [
{
'target_name': 'libGLESv2',