Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52':
Adding deps
Added window.extensions.core_core and window.extensions.core_core-nodeps
Added constraintlayout-core and constraintlayout-core-nodeps
Ignore-AOSP-First: merge conflict. see aosp/2364085
Change-Id: I2b5a27626803486f162dba8dcf41af7b03b79eb8
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 97136de..65c6cff 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -109,6 +109,7 @@
androidx.activity_activity-ktx(minSdkVersion:14)
androidx.annotation_annotation(minSdkVersion:24)
androidx.annotation_annotation-experimental(minSdkVersion:14)
+androidx.annotation_annotation-jvm(minSdkVersion:24)
androidx.appcompat_appcompat(minSdkVersion:14)
androidx.appcompat_appcompat-resources(minSdkVersion:14)
androidx.arch.core_core-common(minSdkVersion:24)
@@ -119,6 +120,7 @@
androidx.collection_collection(minSdkVersion:24)
androidx.collection_collection-ktx(minSdkVersion:24)
androidx.concurrent_concurrent-futures(minSdkVersion:24)
+androidx.constraintlayout_constraintlayout-core(minSdkVersion:24)
androidx.coordinatorlayout_coordinatorlayout(minSdkVersion:14)
androidx.core_core(minSdkVersion:14)
androidx.core_core-ktx(minSdkVersion:14)
@@ -186,6 +188,8 @@
androidx.versionedparcelable_versionedparcelable(minSdkVersion:14)
androidx.viewpager2_viewpager2(minSdkVersion:14)
androidx.viewpager_viewpager(minSdkVersion:14)
+androidx.webkit_webkit(minSdkVersion:14)
+androidx.window.extensions.core_core(minSdkVersion:14)
androidx.window_window(minSdkVersion:14)
androidx.work_work-runtime(minSdkVersion:14)
apache-commons-compress(minSdkVersion:current)
@@ -210,8 +214,10 @@
car-rotary-lib(minSdkVersion:28)
car-rotary-lib-resources(minSdkVersion:28)
car-ui-lib(minSdkVersion:28)
+car-ui-lib-overlayable-resources(minSdkVersion:28)
car-ui-lib-resources(minSdkVersion:28)
car-ui-lib-source(minSdkVersion:28)
+car-ui-lib-source-no-overlayable(minSdkVersion:28)
census(minSdkVersion:30)
clatd(minSdkVersion:30)
codecs_g711dec(minSdkVersion:29)
@@ -813,6 +819,7 @@
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-jvm-nodeps(minSdkVersion:24)
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:24)
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:30)
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:current)
@@ -838,6 +845,7 @@
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:30)
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:current)
prebuilt_androidx.concurrent_concurrent-futures-nodeps(minSdkVersion:24)
+prebuilt_androidx.constraintlayout_constraintlayout-core-nodeps(minSdkVersion:24)
prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:(no version))
prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:14)
prebuilt_androidx.core_core-ktx-nodeps(minSdkVersion:(no version))
@@ -958,6 +966,8 @@
prebuilt_androidx.viewpager2_viewpager2-nodeps(minSdkVersion:14)
prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:(no version))
prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:14)
+prebuilt_androidx.webkit_webkit-nodeps(minSdkVersion:14)
+prebuilt_androidx.window.extensions.core_core-nodeps(minSdkVersion:14)
prebuilt_androidx.window_window-nodeps(minSdkVersion:14)
prebuilt_androidx.work_work-runtime-nodeps(minSdkVersion:14)
prebuilt_asm-7.0(minSdkVersion:current)