Add 'src/third_party/android_ndk' and '...sdk' dependencies to adapt to changed Android SDK path
This should fix DEPS roll.
It's following this change: https://chromium-review.googlesource.com/1518245
Bug: chromium:943507
Change-Id: I726ea72076ba1430ac6ba83b7f50ace0ee15c629
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128567
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleksandr Iakovenko <iakovenko@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27177}diff --git a/DEPS b/DEPS
index fa102af..e41687b 100644
--- a/DEPS
+++ b/DEPS
@@ -45,6 +45,42 @@
# the commit queue can handle CLs rolling GN CIPD package version
# and whatever else without interference from each other.
'gn_version': 'git_revision:0790d3043387c762a6bacb1ae0a9ebe883188ab2',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_build-tools_version
+ # and whatever else without interference from each other.
+ 'android_sdk_build-tools_version': 'DLK621q5_Bga5EsOr7cp6bHWWxFKx6UHLu_Ix_m3AckC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_emulator_version
+ # and whatever else without interference from each other.
+ 'android_sdk_emulator_version': 'ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_extras_version
+ # and whatever else without interference from each other.
+ 'android_sdk_extras_version': 'iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_patcher_version
+ # and whatever else without interference from each other.
+ 'android_sdk_patcher_version': 'I6FNMhrXlpB-E1lOhMlvld7xt9lBVNOO83KIluXDyA0C',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_platform-tools_version
+ # and whatever else without interference from each other.
+ 'android_sdk_platform-tools_version': '4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_platforms_version
+ # and whatever else without interference from each other.
+ 'android_sdk_platforms_version': 'Kg2t9p0YnQk8bldUv4VA3o156uPXLUfIFAmVZ-Gm5ewC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_sources_version
+ # and whatever else without interference from each other.
+ 'android_sdk_sources_version': 'K9uEn3JvNELEVjjVK_GQD3ZQD3rqAnJSxCWxjmUmRkgC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_tools_version
+ # and whatever else without interference from each other.
+ 'android_sdk_tools_version': 'wYcRQC2WHsw2dKWs4EA7fw9Qsyzu1ds1_fRjKmGxe5QC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_tools-lint_version
+ # and whatever else without interference from each other.
+ 'android_sdk_tools-lint_version': '89hXqZYzCum3delB5RV7J_QyWkaRodqdtQS0s3LMh3wC',
}
deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
@@ -394,6 +430,54 @@
'dep_type': 'cipd',
},
+ 'src/third_party/android_ndk': {
+ 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '4e2cea441bfd43f0863d14f57b1e1844260b9884',
+ 'condition': 'checkout_android_native_support',
+ },
+
+ 'src/third_party/android_sdk/public': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_sdk/public/build-tools',
+ 'version': Var('android_sdk_build-tools_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/emulator',
+ 'version': Var('android_sdk_emulator_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/extras',
+ 'version': Var('android_sdk_extras_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/patcher',
+ 'version': Var('android_sdk_patcher_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/platform-tools',
+ 'version': Var('android_sdk_platform-tools_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/platforms',
+ 'version': Var('android_sdk_platforms_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/sources',
+ 'version': Var('android_sdk_sources_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/tools',
+ 'version': Var('android_sdk_tools_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/tools-lint',
+ 'version': Var('android_sdk_tools-lint_version'),
+ },
+ ],
+ 'condition': 'checkout_android_native_support',
+ 'dep_type': 'cipd',
+ },
+
'src/third_party/icu4j': {
'packages': [
{
