From 9b9b25386b649ade944d5bf8f77ad2491218608e Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 20 Mar 2019 09:04:46 +0100 Subject: [PATCH] Remove duplicate src/third_party/android_ndk dependency in DEPS. 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 Reviewed-by: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#27201} --- DEPS | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 2689117d32..a56d9e1ed4 100644 --- a/DEPS +++ b/DEPS @@ -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', },