admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate src/third_party/android_ndk dependency in DEPS.

Browse Source 
This CL also switches back to "checkout_android" instead of
"checkout_android_native_support" in "condition" fields.

Bug: chromium:943507
Change-Id: Ic0de3df9dc5972a2d4f5fe893180a907323dd2a9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127889
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27201}
This commit is contained in:
Mirko Bonadei 2019-03-20 09:04:46 +01:00 committed by Commit Bot
parent b838952d37
commit 9b9b25386b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DEPS
View File

@ -157,10 +157,6 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_ndk': {
'url': Var('chromium_git') + '/android_ndk.git' + '@' + '4e2cea441bfd43f0863d14f57b1e1844260b9884',
'condition': 'checkout_android',
},
'src/third_party/android_tools': {
'url': Var('chromium_git') + '/android_tools.git' + '@' + '347a7c8078a009e98995985b7ab6ec6b35696dea',
'condition': 'checkout_android',
@ -432,7 +428,7 @@ deps = {
'src/third_party/android_ndk': {
'url': Var('chromium_git') + '/android_ndk.git' + '@' + '4e2cea441bfd43f0863d14f57b1e1844260b9884',
'condition': 'checkout_android_native_support',
'condition': 'checkout_android',
},
'src/third_party/android_sdk/public': {
@ -474,7 +470,7 @@ deps = {
'version': Var('android_sdk_tools-lint_version'),
},
],
'condition': 'checkout_android_native_support',
'condition': 'checkout_android',
'dep_type': 'cipd',
},