Skip to content

Commit

Permalink
🔧 Migrate the Android Support Lib to android_deps
Browse files Browse the repository at this point in the history 
Exercises and applies the new dependency download mechanism
from crrev.com/c/819771
Note: The CL enables the android_deps repo, but that can be
reverted by settings the gn variable enable_android_deps_repository
to false, the former binaries and targets are still all valid.

TBR=klobag@chromium.org

Bug: 794210
Change-Id: Ia29ee554a9bbb3c38bd8f88d16af484da2ee439b
Reviewed-on: https://chromium-review.googlesource.com/837189
Commit-Queue: Nicolas Dossou-Gbété <dgn@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548323}
  • Loading branch information
Nicolas Dossou-gbete authored and Commit Bot committed Apr 5, 2018
1 parent 7170a6c commit b8736d8
Show file tree
Hide file tree
Showing 84 changed files with 6,625 additions and 4 deletions.
286 changes: 286 additions & 0 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,292 @@ deps = {

# === ANDROID_DEPS Generated Code Start ===
# Generated by //tools/android/roll/android_deps/fetch_all.sh
'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 Generated Code End ===
}

Expand Down
2 changes: 1 addition & 1 deletion build/config/android/config.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ if (is_android) {
# When true, uses the third party libraries from //third_party/android_deps
# over the ones in other places. (instead of the support library from
# android_tools for example)
enable_android_deps_repository = false
enable_android_deps_repository = true
}

# We need a second declare_args block to make sure we are using the overridden
Expand Down
Loading

0 comments on commit b8736d8

Please sign in to comment.