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

Unified Diff: DEPS

Issue 2790063006: [WIP] Adding Mockito support in Android instrumentation tests (Closed)
Patch Set: disable multidex for debug builds Created 3 years, 8 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 | chrome/android/BUILD.gn » ('j') | third_party/mockito/proguard.flags » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
diff --git a/DEPS b/DEPS
index ccad6f99ed42e41fc1eac8e9b274d7f2dad4fd44..9cfa25161939ad94579073e81dccc2ca761996d1 100644
--- a/DEPS
+++ b/DEPS
@@ -489,9 +489,6 @@ deps_os = {
'src/third_party/junit/src':
Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481',
- 'src/third_party/mockito/src':
- Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850',
-
'src/third_party/netty-tcnative/src':
Var('chromium_git') + '/external/netty-tcnative.git' + '@' + '2e0f9503f3d4efe6fc3f70077f22471e83ffb446',
@@ -791,6 +788,36 @@ hooks = [
],
},
{
+ 'name': 'mockito',
+ 'pattern': '.',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-android-tools/mockito',
+ '-l', 'third_party/mockito'
+ ],
+ },
+ {
+ 'name': 'android_dalvik_dx',
+ 'pattern': '.',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-android-tools/android_dalvik_dx',
+ '-l', 'third_party/android_dalvik_dx'
+ ],
+ },
+ {
+ 'name': 'android_libcore_dex',
+ 'pattern': '.',
+ 'action': ['python',
+ 'src/build/android/update_deps/update_third_party_deps.py',
+ 'download',
+ '-b', 'chromium-android-tools/android_libcore_dex',
+ '-l', 'third_party/android_libcore_dex'
+ ],
+ },
+ {
# Downloads the current stable linux sysroot to build/linux/ if needed.
# This sysroot updates at about the same rate that the chrome build deps
# change. This script is a no-op except for linux users who are doing
« no previous file with comments | « no previous file | chrome/android/BUILD.gn » ('j') | third_party/mockito/proguard.flags » ('J')

Powered by Google App Engine
This is Rietveld 408576698