Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: DEPS

Issue 1966243002: Revert of Pin dEQP DEPS to ANGLE's DEPS.chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
diff --git a/DEPS b/DEPS
index 7d9e4f28b805088a731692905c39f2e557a50bc0..c40284d5a6b4f6f3100709a81372a57c903727ee 100644
--- a/DEPS
+++ b/DEPS
@@ -85,6 +85,11 @@
# and whatever else without interference from each other.
'nacl_revision': '7965517f3877641df646f0b4823920e24e8ea113',
# Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling dEQP
+ # and whatever else without interference from each other.
+ 'deqp_revision': 'cc0ded6c77267bbb14d21aac358fc5d9690c07f8',
+ 'deqp_url': 'https://android.googlesource.com/platform/external/deqp',
+ # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype-android
# and whatever else without interference from each other.
'freetype_android_revision': 'a512b0fe7a8d9db0e5aa9c0a4db1e92cb861722d',
@@ -321,6 +326,10 @@
# Binaries for nacl sdk.
'src/third_party/nacl_sdk_binaries':
Var('chromium_git') + '/chromium/deps/nacl_sdk_binaries.git' + '@' + '759dfca03bdc774da7ecbf974f6e2b84f43699a5',
+
+ # ANGLE uses dEQP for GPU testing
+ 'src/third_party/deqp/src':
+ Var('deqp_url') + '@' + Var('deqp_revision'),
},
'ios': {
'src/ios/third_party/earl_grey/src':
@@ -394,6 +403,10 @@
# Used for embedded builds. CrOS & Linux use the system version.
'src/third_party/fontconfig/src':
Var('chromium_git') + '/external/fontconfig.git' + '@' + 'f16c3118e25546c1b749f9823c51827a60aeb5c1',
+
+ # ANGLE uses dEQP for GPU testing
+ 'src/third_party/deqp/src':
+ Var('deqp_url') + '@' + Var('deqp_revision'),
# Graphics buffer allocator for Chrome OS.
'src/third_party/minigbm/src':
@@ -840,6 +853,3 @@
'action': ['python', 'src/build/gyp_chromium', '--running-as-hook'],
},
]
-
-# ANGLE manages DEPS that it also owns the build files for, such as dEQP.
-recursedeps = [("src/third_party/angle", "DEPS.chromium")]
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698