Fix manual, disable automatic rolling of googletest and jsoncpp
roll_chromium_deps.py didn't handle properly rolling recursedeps for
these 2 repos, only rolling the top level repo but not internal.
Temporarily disable rolling these 2 repos in roll_chromium_deps.py and
roll them properly to the latest revision used by Chrome.
Change log:
https://chromium.googlesource.com/chromium/src/third_party/googletest/+log/e3c3f879eee34ec81b1e562d8fecd207716d8945..c20c5a3085ab4d90fdb403e3ac98e7991317dd27
https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/f2fb48c3b3d79a75a88a99fba6576b25d42ec528..4fe018038f87675c083d0cfb6a6b57c274fb1753
https://chromium.googlesource.com/chromium/src/third_party/jsoncpp/+log/ec647b85b61f525a1a74e4da7477b0c5371c50f4..30a6ac108e24dabac7c2e0df4d33d55032af4ee7
No change to
https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git/+/645250b6690785be60ab6780ce4b58698d884d11
Bug: angleproject:4973
Change-Id: Ie164c5b1adb8684b875f1be4924b295033e2fb4a
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2365023
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/DEPS b/DEPS
index 183e74f..590cae3 100644
--- a/DEPS
+++ b/DEPS
@@ -41,7 +41,18 @@
# Current revision of googletest.
# Note: this dep cannot be auto-rolled b/c of nesting.
- 'googletest_revision': 'f2fb48c3b3d79a75a88a99fba6576b25d42ec528',
+ 'googletest_revision': '4fe018038f87675c083d0cfb6a6b57c274fb1753',
+
+ # Current revision of Chrome's third_party googletest directory. This
+ # repository is mirrored as a separate repository, with separate git hashes
+ # that don't match the external googletest repository or Chrome. Mirrored
+ # patches will have a different git hash associated with them.
+ # To roll, first get the new hash for chromium_googletest_revision from the
+ # mirror of third_party/googletest located here:
+ # https://chromium.googlesource.com/chromium/src/third_party/googletest/
+ # Then get the new hash for googletest_revision from the root Chrome DEPS
+ # file: https://source.chromium.org/chromium/chromium/src/+/master:DEPS
+ 'chromium_googletest_revision': 'c20c5a3085ab4d90fdb403e3ac98e7991317dd27',
# Current revision of jsoncpp.
# Note: this dep cannot be auto-rolled b/c of nesting.
@@ -56,7 +67,7 @@
# https://chromium.googlesource.com/chromium/src/third_party/jsoncpp/
# Then get the new hash for jsoncpp_revision from the root Chrome DEPS file:
# https://source.chromium.org/chromium/chromium/src/+/master:DEPS
- 'chromium_jsoncpp_revision': 'ec647b85b61f525a1a74e4da7477b0c5371c50f4',
+ 'chromium_jsoncpp_revision': '30a6ac108e24dabac7c2e0df4d33d55032af4ee7',
# Current revision of patched-yasm.
# Note: this dep cannot be auto-rolled b/c of nesting.
@@ -160,7 +171,7 @@
},
'third_party/googletest': {
- 'url': '{chromium_git}/chromium/src/third_party/googletest@e3c3f879eee34ec81b1e562d8fecd207716d8945',
+ 'url': '{chromium_git}/chromium/src/third_party/googletest@{chromium_googletest_revision}',
'condition': 'not build_with_chromium',
},