Commit cf0ab654 authored by Ben Joyce's avatar Ben Joyce Committed by Commit Bot

Add androidx_core_animation.

Don't need third party review as source is source from already added
android_x libraries with same license.
https://chromium.googlesource.com/chromium/src/+/master/third_party/android_deps/README.md
"This is not necessary if you are only upgrading existing package
s or adding packages from the same source and license (e.g. gms)"


"Adding for AnimatorTestRule which would basically time increment
like CompositorAnimator."

Bug: 1147198
Change-Id: If9dcea302dcd49c823e55a784e0c0bb34365c8dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2528122Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarAdrian Taylor <adetaylor@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826578}
parent 75c7fdb2
...@@ -1850,7 +1850,18 @@ deps = { ...@@ -1850,7 +1850,18 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/android_deps/libs/androidx_core_core', 'package': 'chromium/third_party/android_deps/libs/androidx_core_core',
'version': 'version:1.3.0-beta01-cr0', 'version': 'version:1.3.1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/androidx_core_core_animation': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/androidx_core_core_animation',
'version': 'version:1.0.0-SNAPSHOT-cr0',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
......
...@@ -276,7 +276,7 @@ android_aar_prebuilt("androidx_coordinatorlayout_coordinatorlayout_java") { ...@@ -276,7 +276,7 @@ android_aar_prebuilt("androidx_coordinatorlayout_coordinatorlayout_java") {
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("androidx_core_core_java") { android_aar_prebuilt("androidx_core_core_java") {
aar_path = "libs/androidx_core_core/core-1.3.0-beta01.aar" aar_path = "libs/androidx_core_core/core-1.3.1.aar"
info_path = "libs/androidx_core_core/androidx_core_core.info" info_path = "libs/androidx_core_core/androidx_core_core.info"
deps = [ deps = [
":androidx_annotation_annotation_java", ":androidx_annotation_annotation_java",
...@@ -297,6 +297,20 @@ android_aar_prebuilt("androidx_core_core_java") { ...@@ -297,6 +297,20 @@ android_aar_prebuilt("androidx_core_core_java") {
ignore_proguard_configs = true ignore_proguard_configs = true
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("androidx_core_core_animation_java") {
aar_path =
"libs/androidx_core_core_animation/core-animation-1.0.0-SNAPSHOT.aar"
info_path =
"libs/androidx_core_core_animation/androidx_core_core_animation.info"
deps = [
":androidx_annotation_annotation_java",
":androidx_collection_collection_java",
":androidx_core_core_java",
]
resource_overlay = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("androidx_customview_customview_java") { android_aar_prebuilt("androidx_customview_customview_java") {
aar_path = "libs/androidx_customview_customview/customview-1.0.0.aar" aar_path = "libs/androidx_customview_customview/customview-1.0.0.aar"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"libs/androidx_concurrent_concurrent_futures", "libs/androidx_concurrent_concurrent_futures",
"libs/androidx_coordinatorlayout_coordinatorlayout", "libs/androidx_coordinatorlayout_coordinatorlayout",
"libs/androidx_core_core", "libs/androidx_core_core",
"libs/androidx_core_core_animation",
"libs/androidx_cursoradapter_cursoradapter", "libs/androidx_cursoradapter_cursoradapter",
"libs/androidx_customview_customview", "libs/androidx_customview_customview",
"libs/androidx_documentfile_documentfile", "libs/androidx_documentfile_documentfile",
......
...@@ -53,6 +53,7 @@ dependencies { ...@@ -53,6 +53,7 @@ dependencies {
// Support v4 libraries // Support v4 libraries
def androidXSupportLibVersion = '1.0.0' def androidXSupportLibVersion = '1.0.0'
compile "androidx.core:core:1.1.0" compile "androidx.core:core:1.1.0"
compile "androidx.core:core-animation:1.0.0-SNAPSHOT"
compile "androidx.activity:activity:1.1.0" compile "androidx.activity:activity:1.1.0"
compile "androidx.annotation:annotation:1.1.0" compile "androidx.annotation:annotation:1.1.0"
compile "androidx.appcompat:appcompat:1.2.0-beta01" compile "androidx.appcompat:appcompat:1.2.0-beta01"
......
Name: Android Support Library compat Name: Android Support Library compat
Short Name: core Short Name: core
URL: https://developer.android.com/jetpack/androidx URL: https://developer.android.com/jetpack/androidx
Version: 1.3.0-beta01 Version: 1.3.1
License: Apache Version 2.0 License: Apache Version 2.0
License File: LICENSE License File: LICENSE
Security Critical: yes Security Critical: yes
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# found in the LICENSE file. # found in the LICENSE file.
# To create CIPD package run the following command. # To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.3.0-beta01-cr0 # cipd create --pkg-def cipd.yaml -tag version:1.3.1-cr0
package: chromium/third_party/android_deps/libs/androidx_core_core package: chromium/third_party/android_deps/libs/androidx_core_core
description: "Android Support Library compat" description: "Android Support Library compat"
data: data:
- file: core-1.3.0-beta01.aar - file: core-1.3.1.aar
file://third_party/android_deps/OWNERS
\ No newline at end of file
Name: Android Support Animation
Short Name: core-animation
URL: https://developer.android.com/jetpack/androidx/releases/core#1.0.0-SNAPSHOT
Version: 1.0.0-SNAPSHOT
License: Apache Version 2.0
License File: LICENSE
Security Critical: yes
Description:
This library provides functionalities for creating and manipulating animations for API 14 and above.
Local Modifications:
No modifications.
# Generated by //build/android/gyp/aar.py
# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
aidl = []
assets = []
has_classes_jar = true
has_native_libraries = false
has_proguard_flags = false
has_r_text_file = true
is_manifest_empty = true
manifest_package = "androidx.core.animation"
resources = []
subjar_tuples = []
subjars = []
# Copyright 2018 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.0.0-SNAPSHOT-cr0
package: chromium/third_party/android_deps/libs/androidx_core_core_animation
description: "Android Support Animation"
data:
- file: core-animation-1.0.0-SNAPSHOT.aar
...@@ -24,6 +24,7 @@ dependencies { ...@@ -24,6 +24,7 @@ dependencies {
compile "androidx.lifecycle:lifecycle-viewmodel:{{androidx_dependency_version}}" compile "androidx.lifecycle:lifecycle-viewmodel:{{androidx_dependency_version}}"
compile "androidx.core:core:{{androidx_dependency_version}}" compile "androidx.core:core:{{androidx_dependency_version}}"
compile "androidx.core:core-animation:{{androidx_dependency_version}}"
compile "androidx.activity:activity:{{androidx_dependency_version}}" compile "androidx.activity:activity:{{androidx_dependency_version}}"
compile "androidx.annotation:annotation:{{androidx_dependency_version}}" compile "androidx.annotation:annotation:{{androidx_dependency_version}}"
compile "androidx.appcompat:appcompat:{{androidx_dependency_version}}" compile "androidx.appcompat:appcompat:{{androidx_dependency_version}}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment