Partial cherry-pick from internal master
... to avoid merge conflict of changes from aosp/master.
Bug: N/A
Test: m
Merged-In: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
Change-Id: I08a1911b00076b141aeab9016a29b0200104b308
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 6479e29..ee1c5f6 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -584,10 +584,12 @@
permissioncontroller-statsd(minSdkVersion:current)
philox_random(minSdkVersion:(no version))
philox_random_headers(minSdkVersion:(no version))
+PlatformProperties(minSdkVersion:current)
prebuilt_androidx-constraintlayout_constraintlayout-nodeps(minSdkVersion:(no version))
prebuilt_androidx-constraintlayout_constraintlayout-solver-nodeps(minSdkVersion:current)
prebuilt_androidx.activity_activity-ktx-nodeps(minSdkVersion:(no version))
prebuilt_androidx.activity_activity-nodeps(minSdkVersion:(no version))
+prebuilt_androidx.annotation_annotation-experimental-nodeps(minSdkVersion:(no version))
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:24)
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:30)
prebuilt_androidx.annotation_annotation-nodeps(minSdkVersion:current)
@@ -603,6 +605,8 @@
prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:current)
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:24)
prebuilt_androidx.collection_collection-nodeps(minSdkVersion:current)
+prebuilt_androidx.concurrent_concurrent-futures-nodeps(minSdkVersion:24)
+prebuilt_androidx.concurrent_concurrent-futures-nodeps(minSdkVersion:current)
prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:(no version))
prebuilt_androidx.core_core-ktx-nodeps(minSdkVersion:(no version))
prebuilt_androidx.core_core-nodeps(minSdkVersion:(no version))
@@ -649,13 +653,19 @@
prebuilt_androidx.print_print-nodeps(minSdkVersion:(no version))
prebuilt_androidx.recyclerview_recyclerview-nodeps(minSdkVersion:(no version))
prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:(no version))
+prebuilt_androidx.room_room-common-nodeps(minSdkVersion:24)
+prebuilt_androidx.room_room-common-nodeps(minSdkVersion:current)
+prebuilt_androidx.room_room-runtime-nodeps(minSdkVersion:(no version))
+prebuilt_androidx.savedstate_savedstate-ktx-nodeps(minSdkVersion:(no version))
prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:(no version))
prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:(no version))
prebuilt_androidx.swiperefreshlayout_swiperefreshlayout-nodeps(minSdkVersion:(no version))
+prebuilt_androidx.tracing_tracing-nodeps(minSdkVersion:(no version))
prebuilt_androidx.transition_transition-nodeps(minSdkVersion:(no version))
prebuilt_androidx.vectordrawable_vectordrawable-animated-nodeps(minSdkVersion:(no version))
prebuilt_androidx.vectordrawable_vectordrawable-nodeps(minSdkVersion:(no version))
prebuilt_androidx.versionedparcelable_versionedparcelable-nodeps(minSdkVersion:(no version))
+prebuilt_androidx.viewpager2_viewpager2-nodeps(minSdkVersion:(no version))
prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:(no version))
prebuilt_asm-7.0(minSdkVersion:(no version))
prebuilt_asm-commons-7.0(minSdkVersion:(no version))
