From ce086d36a4c4d694c1514c1412f08c2ae1d7258c Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 30 Aug 2018 16:40:55 -0400 Subject: [PATCH] Another manual ANGLE roll This commit rebased the source paths in the .gni file from ANGLE's src/ directory to its project root. The update to third_party/angle2/BUILD.gn does the same. 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 Change-Id: Id814f67bed2dfab11f878544989054e38987a939 Reviewed-on: https://skia-review.googlesource.com/150485 Commit-Queue: Mike Klein Commit-Queue: Stephan Altmueller Auto-Submit: Mike Klein Reviewed-by: Stephan Altmueller --- DEPS | 2 +- third_party/angle2/BUILD.gn | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 1218cebce1..5f40b4f237 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { 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@e1037e9be37749becf4514efe5fd5e41170c073c", + "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@44b2c0b1d349a28ee06fe6f2bbedc6980f3f20b6", "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae", "third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae", "third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55", diff --git a/third_party/angle2/BUILD.gn b/third_party/angle2/BUILD.gn index 752cf0bdb6..8de55589bb 100644 --- a/third_party/angle2/BUILD.gn +++ b/third_party/angle2/BUILD.gn @@ -91,7 +91,7 @@ shared_library("libGLESv2") { libangle_common_sources + libangle_image_util_sources + libglesv2_sources + libangle_gl_sources, ".", - "$angle_root/src") + angle_root) if (is_win) { sources += [ "$angle_root/src/libGLESv2/libGLESv2_autogen.def" ] } @@ -104,7 +104,7 @@ shared_library("libGLESv2") { sources += rebase_path(libangle_gl_glx_sources + libangle_common_linux_sources, ".", - "$angle_root/src") + + angle_root) + [ "$angle_root/src/third_party/libXNVCtrl/NVCtrl.c" ] } else if (is_win) { defines += [ @@ -115,7 +115,7 @@ shared_library("libGLESv2") { libangle_d3d9_sources + libangle_d3d11_sources + libangle_d3d11_win32_sources + libangle_common_win_sources, ".", - "$angle_root/src") + angle_root) libs += [ "d3d9.lib", "dxguid.lib", @@ -135,7 +135,7 @@ shared_library("libEGL") { deps = [ ":libGLESv2", ] - sources = rebase_path(libegl_sources, ".", "$angle_root/src") + sources = rebase_path(libegl_sources, ".", angle_root) if (is_win) { sources += [ "$angle_root/src/libEGL/libEGL.def" ] }