Roll back to ANGLE/2845

1 files changed, 20 insertions, 23 deletions

diff --git a/gfx/angle/DEPS b/gfx/angle/DEPS
index 7c39e0093..b5951d6d9 100755
--- a/gfx/angle/DEPS
+++ b/gfx/angle/DEPS
@@ -3,30 +3,32 @@ vars = {
 }
 
 deps = {
-  'third_party/gyp':
-      Var('chromium_git') + '/external/gyp' + '@' + '81c2e5ff92af29bab61c982808076ddce3d200a2',
+  "third_party/gyp":
+      Var('chromium_git') + "/external/gyp@81c2e5ff92af29bab61c982808076ddce3d200a2",
 
-  'testing/gtest':
-    Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
+  # TODO(kbr): figure out how to better stay in sync with Chromium's
+  # versions of googletest and googlemock.
+  "src/tests/third_party/googletest":
+      Var('chromium_git') + "/external/googletest.git@9855a87157778d39b95eccfb201a9dc90f6d61c6",
 
-  'testing/gmock':
-    Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
+  "src/tests/third_party/googlemock":
+      Var('chromium_git') + "/external/googlemock.git@b2cb211e49d872101d991201362d7b97d7d69910",
 
   # Cherry is a dEQP management GUI written in Go. We use it for viewing test results.
-  'third_party/cherry':
-      'https://android.googlesource.com/platform/external/cherry' + '@' + 'd2e26b4d864ec2a6757e7f1174e464949ca5bf73',
+  "third_party/cherry":
+      "https://android.googlesource.com/platform/external/cherry@d2e26b4d864ec2a6757e7f1174e464949ca5bf73",
 
-  'third_party/deqp/src':
-      'https://android.googlesource.com/platform/external/deqp' + '@' + 'f4f3d8079e7a37d7675ab93583e6438d0bca0e58',
+  "third_party/deqp/src":
+      "https://android.googlesource.com/platform/external/deqp@f4f3d8079e7a37d7675ab93583e6438d0bca0e58",
 
-  'third_party/libpng':
-      'https://android.googlesource.com/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c',
+  "third_party/libpng":
+      "https://android.googlesource.com/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c",
 
-  'third_party/zlib':
-      Var('chromium_git') + '/chromium/src/third_party/zlib' + '@' + 'afd8c4593c010c045902f6c0501718f1823064a3',
+  "third_party/zlib":
+      Var('chromium_git') + "/chromium/src/third_party/zlib@afd8c4593c010c045902f6c0501718f1823064a3",
 
-  'buildtools':
-      Var('chromium_git') + '/chromium/buildtools.git' + '@' + '39b1db2ab4aa4b2ccaa263c29bdf63e7c1ee28aa',
+  "buildtools":
+      Var('chromium_git') + '/chromium/buildtools.git@06e80a0e17319868d4a9b13f9bb6a248dc8d8b20',
 }
 
 hooks = [
@@ -100,12 +102,7 @@ hooks = [
   },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
-    'pattern': '.',
-    'action': ['python', 'gyp/gyp_angle'],
+    "pattern": ".",
+    "action": ["python", "build/gyp_angle"],
   },
 ]
-
-recursedeps = [
-  # buildtools provides clang_format.
-  'buildtools',
-]