Roll chromium_revision 60074bf9e0..5fe256ab5e (709436:709762)

Change log: https://chromium.googlesource.com/chromium/src/+log/60074bf9e0..5fe256ab5e Full diff: https://chromium.googlesource.com/chromium/src/+/60074bf9e0..5fe256ab5e Changed dependencies * build: https://chromium.googlesource.com/chromium/src/build.git/+log/a193dcc697..258e22bc61 * testing: https://chromium.googlesource.com/chromium/src/testing/+log/f712af4fd9..85152663b9 * third_party/jsoncpp: https://chromium.googlesource.com/chromium/src/third_party/jsoncpp/+log/571788934b..1cfec065ed * third_party/yasm: https://chromium.googlesource.com/chromium/src/third_party/yasm/+log/cc10bc0f1d..02a8d2167f DEPS diff: https://chromium.googlesource.com/chromium/src/+/60074bf9e0..5fe256ab5e/DEPS No update to Clang. Also includes new DEPS for jsoncpp and yasm. TBR=jmadill@chromium.org, BUG=1017514 Change-Id: I0f1998407f74521251d920d269ad2787e79fb57d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1882273Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Roll chromium_revision 60074bf9e0..5fe256ab5e (709436:709762)
e7c8e80d · Jamie Madill · Commit Bot · 76763cb9 · e7c8e80d
Commit e7c8e80d authored Oct 26, 2019 by Jamie Madill Committed by Commit Bot Oct 26, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 15 deletions

DEPS DEPS +15 -15

No files found.
--- a/DEPS
+++ b/DEPS
@@ -21,7 +21,7 @@ vars = {
  'checkout_src_internal': False,
  # Version of Chromium our Chromium-based DEPS are mirrored from.
-  'chromium_revision': '60074bf9e0d443e5ef8e2c78694ce71bf419de3f',
+  'chromium_revision': '5fe256ab5e5eb3d73d23ab52c69ba113145d921b',
  # Current revision of dEQP.
  'deqp_revision': 'd3eef28e67ce6795ba3a2124aaa977819729d45f',
@@ -33,6 +33,14 @@ vars = {
  # Note: this dep cannot be auto-rolled b/c of nesting.
  'googletest_revision': 'f2fb48c3b3d79a75a88a99fba6576b25d42ec528',
+  # Current revision of jsoncpp.
+  # Note: this dep cannot be auto-rolled b/c of nesting.
+  'jsoncpp_revision': '645250b6690785be60ab6780ce4b58698d884d11',
+  # Current revision of patched-yasm.
+  # Note: this dep cannot be auto-rolled b/c of nesting.
+  'patched_yasm_revision': '720b70524a4424b15fc57e82263568c8ba0496ad',
  # Current revision fo the SPIRV-Headers Vulkan support library.
  'spirv_headers_revision': 'af64a9e826bf5bb5fcd2434dd71be1e41e922563',
@@ -55,7 +63,7 @@ vars = {
 deps = {
  'build': {
-    'url': '{chromium_git}/chromium/src/build.git@a193dcc6972da816f06d8e3ea82ee9181e398b21',
+    'url': '{chromium_git}/chromium/src/build.git@258e22bc612da7425c3a64d733041683a9d123f1',
    'condition': 'not build_with_chromium',
  },
@@ -65,7 +73,7 @@ deps = {
  },
  'testing': {
-    'url': '{chromium_git}/chromium/src/testing@f712af4fd9133068c6d9244cd87fca28979695c0',
+    'url': '{chromium_git}/chromium/src/testing@85152663b9e65c5372e8eb080d936e1b6fbd3b6b',
    'condition': 'not build_with_chromium',
  },
@@ -117,12 +125,7 @@ deps = {
  },
  'third_party/jsoncpp': {
-    'url': '{chromium_git}/chromium/src/third_party/jsoncpp@571788934b5ee8643d53e5d054534abbe6006168',
+    'url': '{chromium_git}/chromium/src/third_party/jsoncpp@1cfec065ed4cd9a01fa8e351baa3e714a5868522',
-    'condition': 'not build_with_chromium',
-   },
-  'third_party/jsoncpp/source': {
-    'url' : '{chromium_git}/external/github.com/open-source-parsers/jsoncpp.git@645250b6690785be60ab6780ce4b58698d884d11',
    'condition': 'not build_with_chromium',
   },
@@ -189,12 +192,7 @@ deps = {
  },
  'third_party/yasm': {
-    'url': '{chromium_git}/chromium/src/third_party/yasm@cc10bc0f1d96a4bae0e775f2ac2b6ac5b08078c6',
+    'url': '{chromium_git}/chromium/src/third_party/yasm@02a8d2167f476660411ea7e1ee6fbd21dda44e96',
-    'condition': 'not build_with_chromium',
-  },
-  'third_party/yasm/source/patched-yasm': {
-    'url': '{chromium_git}/chromium/deps/yasm/patched-yasm.git@720b70524a4424b15fc57e82263568c8ba0496ad',
    'condition': 'not build_with_chromium',
  },
@@ -359,4 +357,6 @@ recursedeps = [
  # buildtools provides clang_format.
  'buildtools',
  'third_party/googletest',
+  'third_party/jsoncpp',
+  'third_party/yasm',
 ]