Merge changes I9b0590b3,Ia9a6f19c am: cd130663dc am: 2ef12995a3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689777

Change-Id: I2ba858185de2c6826defeff296e6dd94604af87b
This commit is contained in:
Anton Hansson
2021-04-29 09:22:04 +00:00
committed by Automerger Merge Worker

View File

@@ -447,6 +447,7 @@ libtflite_static(minSdkVersion:30)
libui(minSdkVersion:29)
libui-types(minSdkVersion:apex_inherit)
libui_headers(minSdkVersion:29)
libunwind_llvm(minSdkVersion:apex_inherit)
libunwindstack(minSdkVersion:29)
libutf(minSdkVersion:(no version))
libutils(minSdkVersion:apex_inherit)
@@ -531,12 +532,14 @@ prebuilt_androidx.activity_activity-nodeps(minSdkVersion:14)
prebuilt_androidx.annotation_annotation-experimental-nodeps(minSdkVersion:(no version))
prebuilt_androidx.annotation_annotation-experimental-nodeps(minSdkVersion:14)
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:24)
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:30)
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:current)
prebuilt_androidx.appcompat_appcompat-nodeps(minSdkVersion:(no version))
prebuilt_androidx.appcompat_appcompat-nodeps(minSdkVersion:14)
prebuilt_androidx.appcompat_appcompat-resources-nodeps(minSdkVersion:(no version))
prebuilt_androidx.appcompat_appcompat-resources-nodeps(minSdkVersion:14)
prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:24)
prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:30)
prebuilt_androidx.arch.core_core-common-nodeps(minSdkVersion:current)
prebuilt_androidx.arch.core_core-runtime-nodeps(minSdkVersion:(no version))
prebuilt_androidx.arch.core_core-runtime-nodeps(minSdkVersion:14)
@@ -547,8 +550,10 @@ prebuilt_androidx.autofill_autofill-nodeps(minSdkVersion:14)
prebuilt_androidx.cardview_cardview-nodeps(minSdkVersion:(no version))
prebuilt_androidx.cardview_cardview-nodeps(minSdkVersion:14)
prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:24)
prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:30)
prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:current)
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:24)
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:30)
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:current)
prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:(no version))
prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:14)
@@ -582,8 +587,10 @@ prebuilt_androidx.legacy_legacy-support-core-utils-nodeps(minSdkVersion:14)
prebuilt_androidx.legacy_legacy-support-v13-nodeps(minSdkVersion:(no version))
prebuilt_androidx.legacy_legacy-support-v13-nodeps(minSdkVersion:14)
prebuilt_androidx.lifecycle_lifecycle-common-java8-nodeps(minSdkVersion:24)
prebuilt_androidx.lifecycle_lifecycle-common-java8-nodeps(minSdkVersion:30)
prebuilt_androidx.lifecycle_lifecycle-common-java8-nodeps(minSdkVersion:current)
prebuilt_androidx.lifecycle_lifecycle-common-nodeps(minSdkVersion:24)
prebuilt_androidx.lifecycle_lifecycle-common-nodeps(minSdkVersion:30)
prebuilt_androidx.lifecycle_lifecycle-common-nodeps(minSdkVersion:current)
prebuilt_androidx.lifecycle_lifecycle-extensions-nodeps(minSdkVersion:(no version))
prebuilt_androidx.lifecycle_lifecycle-extensions-nodeps(minSdkVersion:14)