Follow "Migrate the Android Support Lib to android_deps" from Chromium
This is a copy of https://chromium.googlesource.com/chromium/src/+/b8736d858c675abc4dda8e698967b2a08a83a66b
We probably don't need most of this but the build loudly screams without all those files, so whatever...
Bug: webrtc:9118
Change-Id: I5df54b4857eee9a2bcf8dea05e36f009570a0e21
Reviewed-on: https://webrtc-review.googlesource.com/89586
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24043}diff --git a/.gn b/.gn
index 2a304ba..9110455 100644
--- a/.gn
+++ b/.gn
@@ -76,10 +76,6 @@
# WebRTC relies on Chromium's Android test infrastructure.
use_cxx11_on_android = false
- # Opt out of "Migrate the Android Support Lib to android_deps".
- # http://bugs.webrtc.org/9118
- enable_android_deps_repository = false
-
# WebRTC does not provide the gflags dependency. Because libyuv uses it only
# for unittests, it can be disabled (see third_party/libyuv/BUILD.gn)
libyuv_use_gflags = false
diff --git a/DEPS b/DEPS
index 1a152fa..f3364f8 100644
--- a/DEPS
+++ b/DEPS
@@ -376,6 +376,269 @@
'condition': 'checkout_android',
'dep_type': 'cipd',
},
+
+ # === ANDROID_DEPS Start ===
+ 'src/third_party/android_deps/repository/android_arch_core_common': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/android_arch_core_common',
+ 'version': 'version:1.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/android_arch_lifecycle_common': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/android_arch_lifecycle_common',
+ 'version': 'version:1.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/android_arch_lifecycle_runtime': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/android_arch_lifecycle_runtime',
+ 'version': 'version:1.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_animated_vector_drawable': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_animated_vector_drawable',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_appcompat_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_appcompat_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_cardview_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_cardview_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_design': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_design',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_gridlayout_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_gridlayout_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_leanback_v17': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_leanback_v17',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_mediarouter_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_mediarouter_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_multidex': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_multidex',
+ 'version': 'version:1.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_palette_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_palette_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_preference_leanback_v17': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_leanback_v17',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_preference_v14': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_v14',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_preference_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_preference_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_recyclerview_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_recyclerview_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_annotations': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_annotations',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_compat': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_compat',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_core_ui': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_core_ui',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_core_utils': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_core_utils',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_fragment': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_fragment',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_media_compat': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_media_compat',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_v13': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_v13',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_v4': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_v4',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_support_vector_drawable': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_support_vector_drawable',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_deps/repository/com_android_support_transition': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/repository/com_android_support_transition',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ # === ANDROID_DEPS End ===
}
hooks = [
