Commit 07035681 by Jamie Madill Committed by Commit Bot

Use googletest nested DEPS file.

This will fix the issue where gclient didn't support checking out DEPS-inside-DEPS. We pass a 'googletest_revision' variable to third_party/googletest via recursedeps. Bug: chromium:1017514 Change-Id: I4ef3785e385775910f24e13e60e284b8ab2996d6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1881023Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 7d51cc98
...@@ -29,6 +29,10 @@ vars = { ...@@ -29,6 +29,10 @@ vars = {
# Current revision of glslang, the Khronos SPIRV compiler. # Current revision of glslang, the Khronos SPIRV compiler.
'glslang_revision': 'b131630e7c749a5dc19faa458024260c71fb170f', 'glslang_revision': 'b131630e7c749a5dc19faa458024260c71fb170f',
# Current revision of googletest.
# Note: this dep cannot be auto-rolled b/c of nesting.
'googletest_revision': 'f2fb48c3b3d79a75a88a99fba6576b25d42ec528',
# Current revision fo the SPIRV-Headers Vulkan support library. # Current revision fo the SPIRV-Headers Vulkan support library.
'spirv_headers_revision': '842ec90674627ed2ffef609e3cd79d1562eded01', 'spirv_headers_revision': '842ec90674627ed2ffef609e3cd79d1562eded01',
...@@ -101,11 +105,6 @@ deps = { ...@@ -101,11 +105,6 @@ deps = {
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
'third_party/googletest/src': {
'url': '{chromium_git}/external/github.com/google/googletest.git@f2fb48c3b3d79a75a88a99fba6576b25d42ec528',
'condition': 'not build_with_chromium',
},
# libjpeg_turbo is used by glmark2. # libjpeg_turbo is used by glmark2.
'third_party/libjpeg_turbo': { 'third_party/libjpeg_turbo': {
'url': '{chromium_git}/chromium/deps/libjpeg_turbo.git@bc13578529255ec75005ffc98aae151666122892', 'url': '{chromium_git}/chromium/deps/libjpeg_turbo.git@bc13578529255ec75005ffc98aae151666122892',
...@@ -359,4 +358,5 @@ hooks = [ ...@@ -359,4 +358,5 @@ hooks = [
recursedeps = [ recursedeps = [
# buildtools provides clang_format. # buildtools provides clang_format.
'buildtools', 'buildtools',
'third_party/googletest',
] ]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment