Roll Chromium DEPS (April 30, 2019).

Required a few build tweaks because GN check does not understand #ifdef includes. Bug: angleproject:3411 Change-Id: I1aa7b97626767e3dc973bfa55f5b2a511c806ec9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1589148Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Roll Chromium DEPS (April 30, 2019).
8f39cd83 · Jamie Madill · Commit Bot · 0f861bd8 · 8f39cd83 · 8f39cd83
Commit 8f39cd83 authored Apr 10, 2019 by Jamie Madill Committed by Commit Bot May 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 10 deletions

DEPS DEPS +6 -6

libGLESv2.gni src/libGLESv2.gni +3 -0

util.gni util/util.gni +2 -4

No files found.
--- a/DEPS
+++ b/DEPS
@@ -36,17 +36,17 @@ vars = {
 deps = {

  '{angle_root}/build': {
-    'url': '{chromium_git}/chromium/src/build.git@a660b0b9174e3a808f620222017566e8d1b2669b',
+    'url': '{chromium_git}/chromium/src/build.git@54ea0e7fd122348de2f73ac21d1b6eafb9b78969',
    'condition': 'not build_with_chromium',
  },

  '{angle_root}/buildtools': {
-    'url': '{chromium_git}/chromium/src/buildtools.git@459baaf66bee809f6eb288e0215cf524f4d2429a',
+    'url': '{chromium_git}/chromium/src/buildtools.git@d5c58b84d50d256968271db459cd29b22bff1ba2',
    'condition': 'not build_with_chromium',
  },

  '{angle_root}/testing': {
-    'url': '{chromium_git}/chromium/src/testing@083d633e752e7a57cbe62a468a06e51e28c49ee9',
+    'url': '{chromium_git}/chromium/src/testing@32e614b7ec7b2b741351c1b8470aaf30c2f532fa',
    'condition': 'not build_with_chromium',
  },

@@ -76,12 +76,12 @@ deps = {
  },

  '{angle_root}/third_party/googletest': {
-    'url': '{chromium_git}/chromium/src/third_party/googletest@660425b1c5ca04559ab7e50c7572b5b771acca1c',
+    'url': '{chromium_git}/chromium/src/third_party/googletest@d5024103c8a8977156ee800eb1c84d92dffe9fdf',
    'condition': 'not build_with_chromium',
  },

  '{angle_root}/third_party/googletest/src': {
-    'url': '{chromium_git}/external/github.com/google/googletest.git@7203f37f57e4fef0d77670098aabc186309eb874',
+    'url': '{chromium_git}/external/github.com/google/googletest.git@9997a830ee5589c2da79198bc3b60d1c47e50118',
    'condition': 'not build_with_chromium',
  },

@@ -179,7 +179,7 @@ deps = {
  },

  '{angle_root}/tools/clang': {
-    'url': '{chromium_git}/chromium/src/tools/clang.git@3114fbc11f9644c54dd0a4cdbfa867bac50ff983',
+    'url': '{chromium_git}/chromium/src/tools/clang.git@210f1dc3ebf8504ae246d925e9110ec427eef43f',
    'condition': 'not build_with_chromium',
  },


--- a/src/libGLESv2.gni
+++ b/src/libGLESv2.gni
@@ -943,4 +943,7 @@ libegl_sources = [
  "src/libEGL/libEGL.cpp",
  "src/libEGL/libEGL.rc",
  "src/libEGL/resource.h",
+  "src/libGLESv2/entry_points_egl.h",
+  "src/libGLESv2/entry_points_egl_ext.h",
+  "src/libEGL/egl_loader_autogen.h",
 ]
--- a/util/util.gni
+++ b/util/util.gni
@@ -35,13 +35,11 @@ util_win_sources = [
  "util/windows/Windows_system_utils.cpp",
  "util/windows/WindowsTimer.cpp",
  "util/windows/WindowsTimer.h",
-]
-
-util_win_shared_sources = [
-  "util/windows/WGLWindow.cpp",
  "util/windows/WGLWindow.h",
 ]

+util_win_shared_sources = [ "util/windows/WGLWindow.cpp" ]
+
 util_winrt_sources = [
  "util/windows/winrt/WinRT_system_utils.cpp",
  "util/windows/winrt/WinRTPixmap.cpp",