commit 64a1d4a7fcb88733ac62d9061eb9111cc9ff7691
author Brian Osman <brianosman@google.com> Tue May 15 10:43:08 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue May 15 15:59:23 2018 +0000
tree 5fdeb686234b5f8e9ba47707edf5648bdafe4f7e
parent 44a9d5726d4c6f323fcc8c828cfdf6dbd3e12048

Roll third_party/externals/angle2/ 5d2ccc534..a00ef3144 (10 commits)

Manual roll including GN fixes

https://chromium.googlesource.com/angle/angle.git/+log/5d2ccc534d26..a00ef3144f70

$ git log 5d2ccc534..a00ef3144 --date=short --no-merges --format='%ad %ae %s'
2018-05-14 geofflang Add more dEQP EGL expectations for Linux and Android.
2018-05-14 geofflang Add more dEQP EGL expectations for Linux and Android.
2018-05-14 cwallez DisplayGLX: Close the X display if we own it.
2018-05-14 geofflang Add more dEQP EGL expectations for Linux and Android.
2018-05-14 geofflang DEQP: Print not supported messages from tests.
2018-05-14 geofflang Add dEQP EGL test expectations for Linux and Android.
2018-05-10 jmadill Vulkan: Implement masked color clear with depth.
2018-05-14 jmadill Fix libGLESv2 wrong .def file.
2018-05-14 jmadill Fix warnings from size_t conversions.
2018-04-23 lfy GLES1: Renderer (minimal)

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE
TBR=herb@google.com

Change-Id: I0ed2b9c8824b7833a4a0234204cb849805717daa
Reviewed-on: https://skia-review.googlesource.com/128322
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index fca6faa..b138b59 100644
--- a/DEPS
+++ b/DEPS
@@ -3,7 +3,7 @@
 deps = {
   "buildtools"                          : "https://chromium.googlesource.com/chromium/buildtools.git@505de88083136eefd056e5ee4ca0f01fe9b33de8",
   "common"                              : "https://skia.googlesource.com/common.git@9737551d7a52c3db3262db5856e6bcd62c462b92",
-  "third_party/externals/angle2"        : "https://chromium.googlesource.com/angle/angle.git@5d2ccc534d26cc1801dd82479d647cce84ba25e2",
+  "third_party/externals/angle2"        : "https://chromium.googlesource.com/angle/angle.git@74a763205a3d3226011e2aba247cded5ff08ce3a",
   "third_party/externals/dng_sdk"       : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae",
   "third_party/externals/expat"         : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55",
   "third_party/externals/freetype"      : "https://skia.googlesource.com/third_party/freetype2.git@fa6da7bf6dcbcfa22d2464259ad1cccee3233189",

third_party/angle2/BUILD.gn

diff --git a/third_party/angle2/BUILD.gn b/third_party/angle2/BUILD.gn
index 33395d7..d36626d 100644
--- a/third_party/angle2/BUILD.gn
+++ b/third_party/angle2/BUILD.gn
@@ -103,10 +103,9 @@
               gles_gypi.libglesv2_sources + gles_gypi.libangle_gl_sources,
           ".",
           "$angle_root/src")
-  if (!is_win) {
-    sources -= [ "$angle_root/src/libGLESv2/libGLESv2_autogen.def" ]
+  if (is_win) {
+    sources += [ "$angle_root/src/libGLESv2/libGLESv2_autogen.def" ]
   }
-
   if (is_linux) {
     libs += [
       "X11",
@@ -150,7 +149,7 @@
     ":libGLESv2",
   ]
   sources = rebase_path(gles_gypi.libegl_sources, ".", "$angle_root/src")
-  if (!is_win) {
-    sources -= [ "$angle_root/src/libEGL/libEGL.def" ]
+  if (is_win) {
+    sources += [ "$angle_root/src/libEGL/libEGL.def" ]
   }
 }