diff options
| author |  Brian Osman <brianosman@google.com> | 2018-05-15 10:43:08 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-15 15:59:23 +0000 |
| commit | 64a1d4a7fcb88733ac62d9061eb9111cc9ff7691 (patch) | |
| tree | 5fdeb686234b5f8e9ba47707edf5648bdafe4f7e /third_party | |
| parent | 44a9d5726d4c6f323fcc8c828cfdf6dbd3e12048 (diff) | |
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>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/angle2/BUILD.gn | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/angle2/BUILD.gn b/third_party/angle2/BUILD.gn index 33395d74e4..d36626da49 100644 --- a/third_party/angle2/BUILD.gn +++ b/third_party/angle2/BUILD.gn @@ -103,10 +103,9 @@ shared_library("libGLESv2") { 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 @@ shared_library("libEGL") { ":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" ] } } |