зеркало из https://github.com/AvaloniaUI/angle.git
Make the gmock and gtest dirs match Chromium's
Making the dependencies' directories match Chromium's is needed if we want to use the same GN file for Chromium builds and standalone builds. This also rolls the gtest and gmock dependencies to match Chromium. BUG=angleproject:1569 Change-Id: I54ce9c9a29964abfddbea64a0f4466f2c9d48a33 Reviewed-on: https://chromium-review.googlesource.com/403028 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
This commit is contained in:
Corentin Wallez
Commit Bot
Родитель
80bfe0f49f
Коммит
e76f55fefa
|
|
@ -22,8 +22,8 @@ debug.txt
|
|||
*.orig
|
||||
*.rej
|
||||
.gclient_entries
|
||||
/src/tests/third_party/googlemock
|
||||
/src/tests/third_party/googletest
|
||||
/testing/gmock
|
||||
/testing/gtest
|
||||
/third_party/cherry
|
||||
/third_party/deqp/src
|
||||
/third_party/gyp
|
||||
|
|
|
|||
38
DEPS
38
DEPS
|
|
@ -3,32 +3,30 @@ vars = {
|
|||
}
|
||||
|
||||
deps = {
|
||||
"third_party/gyp":
|
||||
Var('chromium_git') + "/external/gyp@81c2e5ff92af29bab61c982808076ddce3d200a2",
|
||||
'third_party/gyp':
|
||||
Var('chromium_git') + '/external/gyp' + '@' + '81c2e5ff92af29bab61c982808076ddce3d200a2',
|
||||
|
||||
# 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/gtest':
|
||||
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
|
||||
|
||||
"src/tests/third_party/googlemock":
|
||||
Var('chromium_git') + "/external/googlemock.git@b2cb211e49d872101d991201362d7b97d7d69910",
|
||||
'testing/gmock':
|
||||
Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
|
||||
|
||||
# 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' + '@' + '39b1db2ab4aa4b2ccaa263c29bdf63e7c1ee28aa',
|
||||
}
|
||||
|
||||
hooks = [
|
||||
|
|
@ -102,8 +100,8 @@ hooks = [
|
|||
},
|
||||
{
|
||||
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
|
||||
"pattern": ".",
|
||||
"action": ["python", "build/gyp_angle"],
|
||||
'pattern': '.',
|
||||
'action': ['python', 'build/gyp_angle'],
|
||||
},
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -71,12 +71,12 @@
|
|||
'includes': [ '../../build/common_defines.gypi', ],
|
||||
'include_dirs':
|
||||
[
|
||||
'third_party/googletest',
|
||||
'third_party/googletest/include',
|
||||
'<(angle_path)/testing/gtest',
|
||||
'<(angle_path)/testing/gtest/include',
|
||||
],
|
||||
'sources':
|
||||
[
|
||||
'third_party/googletest/src/gtest-all.cc',
|
||||
'<(angle_path)/testing/gtest/src/gtest-all.cc',
|
||||
],
|
||||
'defines':
|
||||
[
|
||||
|
|
@ -90,8 +90,8 @@
|
|||
],
|
||||
'include_dirs':
|
||||
[
|
||||
'third_party/googletest',
|
||||
'third_party/googletest/include',
|
||||
'<(angle_path)/testing/gtest',
|
||||
'<(angle_path)/testing/gtest/include',
|
||||
],
|
||||
},
|
||||
},
|
||||
|
|
@ -102,13 +102,13 @@
|
|||
'includes': [ '../../build/common_defines.gypi', ],
|
||||
'include_dirs':
|
||||
[
|
||||
'third_party/googlemock',
|
||||
'third_party/googlemock/include',
|
||||
'third_party/googletest/include',
|
||||
'<(angle_path)/testing/gmock',
|
||||
'<(angle_path)/testing/gmock/include',
|
||||
'<(angle_path)/testing/gtest/include',
|
||||
],
|
||||
'sources':
|
||||
[
|
||||
'third_party/googlemock/src/gmock-all.cc',
|
||||
'<(angle_path)/testing/gmock/src/gmock-all.cc',
|
||||
],
|
||||
'defines':
|
||||
[
|
||||
|
|
@ -122,9 +122,9 @@
|
|||
],
|
||||
'include_dirs':
|
||||
[
|
||||
'third_party/googlemock',
|
||||
'third_party/googlemock/include',
|
||||
'third_party/googletest/include',
|
||||
'<(angle_path)/testing/gmock',
|
||||
'<(angle_path)/testing/gmock/include',
|
||||
'<(angle_path)/testing/gtest/include',
|
||||
],
|
||||
},
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче