Snap for 6224475 from f483ff7e412cc165a00ccd6691dd2b398ece5104 to rvc-release
Change-Id: Ibbffd2037948a5f5be27ec95ef409636418efd45
diff --git a/current/androidx/Android.bp b/current/androidx/Android.bp
index 11a3e79..175272b 100644
--- a/current/androidx/Android.bp
+++ b/current/androidx/Android.bp
@@ -1,5 +1,5 @@
// Automatically generated with:
-// pom2bp -sdk-version current -static-deps '-rewrite=^android.arch.core:common$=android-arch-core-common' '-rewrite=^android.arch.core:runtime$=android-arch-core-runtime' '-rewrite=^android.arch.lifecycle:common$=android-arch-lifecycle-common' '-rewrite=^android.arch.lifecycle:common-java8$=android-arch-lifecycle-common-java8' '-rewrite=^android.arch.lifecycle:extensions$=android-arch-lifecycle-extensions' '-rewrite=^android.arch.lifecycle:livedata$=android-arch-lifecycle-livedata' '-rewrite=^android.arch.lifecycle:livedata-core$=android-arch-lifecycle-livedata-core' '-rewrite=^android.arch.lifecycle:process$=android-arch-lifecycle-process' '-rewrite=^android.arch.lifecycle:runtime$=android-arch-lifecycle-runtime' '-rewrite=^android.arch.lifecycle:service$=android-arch-lifecycle-service' '-rewrite=^android.arch.lifecycle:viewmodel$=android-arch-lifecycle-viewmodel' '-rewrite=^android.arch.paging:common$=android-arch-paging-common' '-rewrite=^android.arch.paging:runtime$=android-arch-paging-runtime' '-rewrite=^android.arch.persistence.room:common$=android-arch-room-common' '-rewrite=^android.arch.persistence.room:migration$=android-arch-room-migration' '-rewrite=^android.arch.persistence.room:runtime$=android-arch-room-runtime' '-rewrite=^android.arch.persistence.room:testing$=android-arch-room-testing' '-rewrite=^android.arch.persistence:db$=android-arch-persistence-db' '-rewrite=^android.arch.persistence:db-framework$=android-arch-persistence-db-framework' '-rewrite=^androidx.activity:activity$=androidx.activity_activity' '-rewrite=^androidx.activity:activity-ktx$=androidx.activity_activity-ktx' '-rewrite=^androidx.annotation:annotation$=androidx.annotation_annotation' '-rewrite=^androidx.appcompat:appcompat$=androidx.appcompat_appcompat' '-rewrite=^androidx.appcompat:appcompat-resources$=androidx.appcompat_appcompat-resources' '-rewrite=^androidx.arch.core:core-common$=androidx.arch.core_core-common' '-rewrite=^androidx.arch.core:core-runtime$=androidx.arch.core_core-runtime' '-rewrite=^androidx.asynclayoutinflater:asynclayoutinflater$=androidx.asynclayoutinflater_asynclayoutinflater' '-rewrite=^androidx.autofill:autofill$=androidx.autofill_autofill' '-rewrite=^androidx.biometric:biometric$=androidx.biometric_biometric' '-rewrite=^androidx.browser:browser$=androidx.browser_browser' '-rewrite=^androidx.car:car$=androidx.car_car' '-rewrite=^androidx.car:car-cluster$=androidx.car_car-cluster' '-rewrite=^androidx.cardview:cardview$=androidx.cardview_cardview' '-rewrite=^androidx.collection:collection$=androidx.collection_collection' '-rewrite=^androidx.collection:collection-ktx$=androidx.collection_collection-ktx' '-rewrite=^androidx.concurrent:concurrent-futures$=androidx.concurrent_concurrent-futures' '-rewrite=^androidx.concurrent:concurrent-listenablefuture$=androidx.concurrent_concurrent-listenablefuture' '-rewrite=^androidx.concurrent:concurrent-listenablefuture-callback$=androidx.concurrent_concurrent-listenablefuture-callback' '-rewrite=^androidx.constraintlayout:constraintlayout$=androidx-constraintlayout_constraintlayout' '-rewrite=^androidx.constraintlayout:constraintlayout-solver$=androidx-constraintlayout_constraintlayout-solver' '-rewrite=^androidx.contentpaging:contentpaging$=androidx.contentpaging_contentpaging' '-rewrite=^androidx.coordinatorlayout:coordinatorlayout$=androidx.coordinatorlayout_coordinatorlayout' '-rewrite=^androidx.core:core$=androidx.core_core' '-rewrite=^androidx.core:core-ktx$=androidx.core_core-ktx' '-rewrite=^androidx.cursoradapter:cursoradapter$=androidx.cursoradapter_cursoradapter' '-rewrite=^androidx.customview:customview$=androidx.customview_customview' '-rewrite=^androidx.documentfile:documentfile$=androidx.documentfile_documentfile' '-rewrite=^androidx.drawerlayout:drawerlayout$=androidx.drawerlayout_drawerlayout' '-rewrite=^androidx.dynamicanimation:dynamicanimation$=androidx.dynamicanimation_dynamicanimation' '-rewrite=^androidx.emoji:emoji$=androidx.emoji_emoji' '-rewrite=^androidx.emoji:emoji-appcompat$=androidx.emoji_emoji-appcompat' '-rewrite=^androidx.emoji:emoji-bundled$=androidx.emoji_emoji-bundled' '-rewrite=^androidx.exifinterface:exifinterface$=androidx.exifinterface_exifinterface' '-rewrite=^androidx.fragment:fragment$=androidx.fragment_fragment' '-rewrite=^androidx.fragment:fragment-ktx$=androidx.fragment_fragment-ktx' '-rewrite=^androidx.gridlayout:gridlayout$=androidx.gridlayout_gridlayout' '-rewrite=^androidx.heifwriter:heifwriter$=androidx.heifwriter_heifwriter' '-rewrite=^androidx.interpolator:interpolator$=androidx.interpolator_interpolator' '-rewrite=^androidx.leanback:leanback$=androidx.leanback_leanback' '-rewrite=^androidx.leanback:leanback-preference$=androidx.leanback_leanback-preference' '-rewrite=^androidx.legacy:legacy-preference-v14$=androidx.legacy_legacy-preference-v14' '-rewrite=^androidx.legacy:legacy-support-core-ui$=androidx.legacy_legacy-support-core-ui' '-rewrite=^androidx.legacy:legacy-support-core-utils$=androidx.legacy_legacy-support-core-utils' '-rewrite=^androidx.legacy:legacy-support-v13$=androidx.legacy_legacy-support-v13' '-rewrite=^androidx.legacy:legacy-support-v4$=androidx.legacy_legacy-support-v4' '-rewrite=^androidx.lifecycle:lifecycle-common$=androidx.lifecycle_lifecycle-common' '-rewrite=^androidx.lifecycle:lifecycle-common-java8$=androidx.lifecycle_lifecycle-common-java8' '-rewrite=^androidx.lifecycle:lifecycle-extensions$=androidx.lifecycle_lifecycle-extensions' '-rewrite=^androidx.lifecycle:lifecycle-livedata$=androidx.lifecycle_lifecycle-livedata' '-rewrite=^androidx.lifecycle:lifecycle-livedata-core$=androidx.lifecycle_lifecycle-livedata-core' '-rewrite=^androidx.lifecycle:lifecycle-livedata-core-ktx$=androidx.lifecycle_lifecycle-livedata-core-ktx' '-rewrite=^androidx.lifecycle:lifecycle-livedata-ktx$=androidx.lifecycle_lifecycle-livedata-ktx' '-rewrite=^androidx.lifecycle:lifecycle-process$=androidx.lifecycle_lifecycle-process' '-rewrite=^androidx.lifecycle:lifecycle-runtime$=androidx.lifecycle_lifecycle-runtime' '-rewrite=^androidx.lifecycle:lifecycle-runtime-ktx$=androidx.lifecycle_lifecycle-runtime-ktx' '-rewrite=^androidx.lifecycle:lifecycle-service$=androidx.lifecycle_lifecycle-service' '-rewrite=^androidx.lifecycle:lifecycle-viewmodel$=androidx.lifecycle_lifecycle-viewmodel' '-rewrite=^androidx.lifecycle:lifecycle-viewmodel-ktx$=androidx.lifecycle_lifecycle-viewmodel-ktx' '-rewrite=^androidx.lifecycle:lifecycle-viewmodel-savedstate$=androidx.lifecycle_lifecycle-viewmodel-savedstate' '-rewrite=^androidx.loader:loader$=androidx.loader_loader' '-rewrite=^androidx.localbroadcastmanager:localbroadcastmanager$=androidx.localbroadcastmanager_localbroadcastmanager' '-rewrite=^androidx.media2:media2-common$=androidx.media2_media2-common' '-rewrite=^androidx.media2:media2-exoplayer$=androidx.media2_media2-exoplayer' '-rewrite=^androidx.media2:media2-player$=androidx.media2_media2-player' '-rewrite=^androidx.media2:media2-session$=androidx.media2_media2-session' '-rewrite=^androidx.media2:media2-widget$=androidx.media2_media2-widget' '-rewrite=^androidx.media:media$=androidx.media_media' '-rewrite=^androidx.mediarouter:mediarouter$=androidx.mediarouter_mediarouter' '-rewrite=^androidx.multidex:multidex$=androidx-multidex_multidex' '-rewrite=^androidx.multidex:multidex-instrumentation$=androidx-multidex_multidex-instrumentation' '-rewrite=^androidx.navigation:navigation-common$=androidx.navigation_navigation-common' '-rewrite=^androidx.navigation:navigation-common-ktx$=androidx.navigation_navigation-common-ktx' '-rewrite=^androidx.navigation:navigation-fragment$=androidx.navigation_navigation-fragment' '-rewrite=^androidx.navigation:navigation-fragment-ktx$=androidx.navigation_navigation-fragment-ktx' '-rewrite=^androidx.navigation:navigation-runtime$=androidx.navigation_navigation-runtime' '-rewrite=^androidx.navigation:navigation-runtime-ktx$=androidx.navigation_navigation-runtime-ktx' '-rewrite=^androidx.navigation:navigation-ui$=androidx.navigation_navigation-ui' '-rewrite=^androidx.navigation:navigation-ui-ktx$=androidx.navigation_navigation-ui-ktx' '-rewrite=^androidx.paging:paging-common$=androidx.paging_paging-common' '-rewrite=^androidx.paging:paging-common-ktx$=androidx.paging_paging-common-ktx' '-rewrite=^androidx.paging:paging-runtime$=androidx.paging_paging-runtime' '-rewrite=^androidx.palette:palette$=androidx.palette_palette' '-rewrite=^androidx.percentlayout:percentlayout$=androidx.percentlayout_percentlayout' '-rewrite=^androidx.preference:preference$=androidx.preference_preference' '-rewrite=^androidx.print:print$=androidx.print_print' '-rewrite=^androidx.recommendation:recommendation$=androidx.recommendation_recommendation' '-rewrite=^androidx.recyclerview:recyclerview$=androidx.recyclerview_recyclerview' '-rewrite=^androidx.recyclerview:recyclerview-selection$=androidx.recyclerview_recyclerview-selection' '-rewrite=^androidx.remotecallback:remotecallback$=androidx.remotecallback_remotecallback' '-rewrite=^androidx.remotecallback:remotecallback-processor$=androidx.remotecallback_remotecallback-processor' '-rewrite=^androidx.room:room-common$=androidx.room_room-common' '-rewrite=^androidx.room:room-compiler$=androidx.room_room-compiler' '-rewrite=^androidx.room:room-migration$=androidx.room_room-migration' '-rewrite=^androidx.room:room-runtime$=androidx.room_room-runtime' '-rewrite=^androidx.room:room-testing$=androidx.room_room-testing' '-rewrite=^androidx.savedstate:savedstate$=androidx.savedstate_savedstate' '-rewrite=^androidx.slice:slice-builders$=androidx.slice_slice-builders' '-rewrite=^androidx.slice:slice-core$=androidx.slice_slice-core' '-rewrite=^androidx.slice:slice-view$=androidx.slice_slice-view' '-rewrite=^androidx.slidingpanelayout:slidingpanelayout$=androidx.slidingpanelayout_slidingpanelayout' '-rewrite=^androidx.sqlite:sqlite$=androidx.sqlite_sqlite' '-rewrite=^androidx.sqlite:sqlite-framework$=androidx.sqlite_sqlite-framework' '-rewrite=^androidx.swiperefreshlayout:swiperefreshlayout$=androidx.swiperefreshlayout_swiperefreshlayout' '-rewrite=^androidx.textclassifier:textclassifier$=androidx.textclassifier_textclassifier' '-rewrite=^androidx.transition:transition$=androidx.transition_transition' '-rewrite=^androidx.tvprovider:tvprovider$=androidx.tvprovider_tvprovider' '-rewrite=^androidx.vectordrawable:vectordrawable$=androidx.vectordrawable_vectordrawable' '-rewrite=^androidx.vectordrawable:vectordrawable-animated$=androidx.vectordrawable_vectordrawable-animated' '-rewrite=^androidx.versionedparcelable:versionedparcelable$=androidx.versionedparcelable_versionedparcelable' '-rewrite=^androidx.viewpager:viewpager$=androidx.viewpager_viewpager' '-rewrite=^androidx.wear:wear$=androidx.wear_wear' '-rewrite=^androidx.webkit:webkit$=androidx.webkit_webkit' '-rewrite=^com.android.support.constraint:constraint-layout$=android-support-constraint-layout' '-rewrite=^com.android.support.constraint:constraint-layout-solver$=android-support-constraint-layout-solver' '-rewrite=^com.android.support:animated-vector-drawable$=android-support-animatedvectordrawable' '-rewrite=^com.android.support:appcompat-v7$=android-support-v7-appcompat' '-rewrite=^com.android.support:asynclayoutinflater$=android-support-asynclayoutinflater' '-rewrite=^com.android.support:car$=android-support-car' '-rewrite=^com.android.support:cardview-v7$=android-support-v7-cardview' '-rewrite=^com.android.support:collections$=android-support-collections' '-rewrite=^com.android.support:contentpaging$=android-support-contentpaging' '-rewrite=^com.android.support:coordinatorlayout$=android-support-coordinatorlayout' '-rewrite=^com.android.support:cursoradapter$=android-support-cursoradapter' '-rewrite=^com.android.support:customtabs$=android-support-customtabs' '-rewrite=^com.android.support:customview$=android-support-customview' '-rewrite=^com.android.support:design$=android-support-design' '-rewrite=^com.android.support:design-animation$=android-support-design-animation' '-rewrite=^com.android.support:design-bottomappbar$=android-support-design-bottomappbar' '-rewrite=^com.android.support:design-bottomnavigation$=android-support-design-bottomnavigation' '-rewrite=^com.android.support:design-bottomsheet$=android-support-design-bottomsheet' '-rewrite=^com.android.support:design-button$=android-support-design-button' '-rewrite=^com.android.support:design-canvas$=android-support-design-canvas' '-rewrite=^com.android.support:design-card$=android-support-design-card' '-rewrite=^com.android.support:design-chip$=android-support-design-chip' '-rewrite=^com.android.support:design-circularreveal$=android-support-design-circularreveal' '-rewrite=^com.android.support:design-circularreveal-cardview$=android-support-design-circularreveal-cardview' '-rewrite=^com.android.support:design-circularreveal-coordinatorlayout$=android-support-design-circularreveal-coordinatorlayout' '-rewrite=^com.android.support:design-color$=android-support-design-color' '-rewrite=^com.android.support:design-dialog$=android-support-design-dialog' '-rewrite=^com.android.support:design-drawable$=android-support-design-drawable' '-rewrite=^com.android.support:design-expandable$=android-support-design-expandable' '-rewrite=^com.android.support:design-floatingactionbutton$=android-support-design-floatingactionbutton' '-rewrite=^com.android.support:design-internal$=android-support-design-internal' '-rewrite=^com.android.support:design-math$=android-support-design-math' '-rewrite=^com.android.support:design-navigation$=android-support-design-navigation' '-rewrite=^com.android.support:design-resources$=android-support-design-resources' '-rewrite=^com.android.support:design-ripple$=android-support-design-ripple' '-rewrite=^com.android.support:design-shape$=android-support-design-shape' '-rewrite=^com.android.support:design-snackbar$=android-support-design-snackbar' '-rewrite=^com.android.support:design-stateful$=android-support-design-stateful' '-rewrite=^com.android.support:design-tabs$=android-support-design-tabs' '-rewrite=^com.android.support:design-textfield$=android-support-design-textfield' '-rewrite=^com.android.support:design-theme$=android-support-design-theme' '-rewrite=^com.android.support:design-transformation$=android-support-design-transformation' '-rewrite=^com.android.support:design-typography$=android-support-design-typography' '-rewrite=^com.android.support:design-widget$=android-support-design-widget' '-rewrite=^com.android.support:documentfile$=android-support-documentfile' '-rewrite=^com.android.support:drawerlayout$=android-support-drawerlayout' '-rewrite=^com.android.support:exifinterface$=android-support-exifinterface' '-rewrite=^com.android.support:gridlayout-v7$=android-support-v7-gridlayout' '-rewrite=^com.android.support:heifwriter$=android-support-heifwriter' '-rewrite=^com.android.support:interpolator$=android-support-interpolator' '-rewrite=^com.android.support:leanback-v17$=android-support-v17-leanback' '-rewrite=^com.android.support:loader$=android-support-loader' '-rewrite=^com.android.support:localbroadcastmanager$=android-support-localbroadcastmanager' '-rewrite=^com.android.support:mediarouter-v7$=android-support-v7-mediarouter' '-rewrite=^com.android.support:multidex$=android-support-multidex' '-rewrite=^com.android.support:multidex-instrumentation$=android-support-multidex-instrumentation' '-rewrite=^com.android.support:palette-v7$=android-support-v7-palette' '-rewrite=^com.android.support:percent$=android-support-percent' '-rewrite=^com.android.support:preference-leanback-v17$=android-support-v17-preference-leanback' '-rewrite=^com.android.support:preference-v14$=android-support-v14-preference' '-rewrite=^com.android.support:preference-v7$=android-support-v7-preference' '-rewrite=^com.android.support:print$=android-support-print' '-rewrite=^com.android.support:recommendation$=android-support-recommendation' '-rewrite=^com.android.support:recyclerview-selection$=android-support-recyclerview-selection' '-rewrite=^com.android.support:recyclerview-v7$=android-support-v7-recyclerview' '-rewrite=^com.android.support:slices-builders$=android-slices-builders' '-rewrite=^com.android.support:slices-core$=android-slices-core' '-rewrite=^com.android.support:slices-view$=android-slices-view' '-rewrite=^com.android.support:slidingpanelayout$=android-support-slidingpanelayout' '-rewrite=^com.android.support:support-annotations$=android-support-annotations' '-rewrite=^com.android.support:support-compat$=android-support-compat' '-rewrite=^com.android.support:support-content$=android-support-support-content' '-rewrite=^com.android.support:support-core-ui$=android-support-core-ui' '-rewrite=^com.android.support:support-core-utils$=android-support-core-utils' '-rewrite=^com.android.support:support-dynamic-animation$=android-support-dynamic-animation' '-rewrite=^com.android.support:support-emoji$=android-support-emoji' '-rewrite=^com.android.support:support-emoji-appcompat$=android-support-emoji-appcompat' '-rewrite=^com.android.support:support-emoji-bundled$=android-support-emoji-bundled' '-rewrite=^com.android.support:support-fragment$=android-support-fragment' '-rewrite=^com.android.support:support-media-compat$=android-support-media-compat' '-rewrite=^com.android.support:support-tv-provider$=android-support-tv-provider' '-rewrite=^com.android.support:support-v13$=android-support-v13' '-rewrite=^com.android.support:support-v4$=android-support-v4' '-rewrite=^com.android.support:support-vector-drawable$=android-support-vectordrawable' '-rewrite=^com.android.support:swiperefreshlayout$=android-support-swiperefreshlayout' '-rewrite=^com.android.support:textclassifier$=android-support-textclassifier' '-rewrite=^com.android.support:transition$=android-support-transition' '-rewrite=^com.android.support:versionedparcelable$=android-versionedparcelable' '-rewrite=^com.android.support:viewpager$=android-support-viewpager' '-rewrite=^com.android.support:wear$=android-support-wear' '-rewrite=^com.android.support:webkit$=android-support-webkit' '-rewrite=^com.google.android.material:material$=com.google.android.material_material' '-rewrite=^com.google.android:flexbox$=flexbox' '-rewrite=^com.squareup:javapoet$=javapoet-prebuilt-jar' '-rewrite=^com.google.guava:listenablefuture$=guava-listenablefuture-prebuilt-jar' '-rewrite=^sqlite-jdbc$=xerial-sqlite-jdbc' '-rewrite=^kotlinx-metadata-jvm$=kotlin-metadata' '-rewrite=^gson$=gson-prebuilt-jar' -extra-static-libs=android-support-car=prebuilt-android.car-stubs -extra-static-libs=androidx.room_room-compiler=guava-21.0,jetbrains-annotations '-host=androidx.remotecallback:remotecallback-processor' '-host=androidx.room:room-compiler' '-host-and-device=androidx.annotation:annotation' '-host-and-device=androidx.room:room-common' '-host-and-device=androidx.room:room-migration' -exclude=android-arch-room-migration -exclude=android-arch-room-testing .
+// pom2bp -sdk-version current -static-deps '-rewrite=^android.arch.core:common$=android-arch-core-common' '-rewrite=^android.arch.core:runtime$=android-arch-core-runtime' '-rewrite=^android.arch.lifecycle:common$=android-arch-lifecycle-common' '-rewrite=^android.arch.lifecycle:common-java8$=android-arch-lifecycle-common-java8' '-rewrite=^android.arch.lifecycle:extensions$=android-arch-lifecycle-extensions' '-rewrite=^android.arch.lifecycle:livedata$=android-arch-lifecycle-livedata' '-rewrite=^android.arch.lifecycle:livedata-core$=android-arch-lifecycle-livedata-core' '-rewrite=^android.arch.lifecycle:process$=android-arch-lifecycle-process' '-rewrite=^android.arch.lifecycle:runtime$=android-arch-lifecycle-runtime' '-rewrite=^android.arch.lifecycle:service$=android-arch-lifecycle-service' '-rewrite=^android.arch.lifecycle:viewmodel$=android-arch-lifecycle-viewmodel' '-rewrite=^android.arch.paging:common$=android-arch-paging-common' '-rewrite=^android.arch.paging:runtime$=android-arch-paging-runtime' '-rewrite=^android.arch.persistence.room:common$=android-arch-room-common' '-rewrite=^android.arch.persistence.room:migration$=android-arch-room-migration' '-rewrite=^android.arch.persistence.room:runtime$=android-arch-room-runtime' '-rewrite=^android.arch.persistence.room:testing$=android-arch-room-testing' '-rewrite=^android.arch.persistence:db$=android-arch-persistence-db' '-rewrite=^android.arch.persistence:db-framework$=android-arch-persistence-db-framework' '-rewrite=^androidx.activity:activity$=androidx.activity_activity' '-rewrite=^androidx.activity:activity-ktx$=androidx.activity_activity-ktx' '-rewrite=^androidx.annotation:annotation$=androidx.annotation_annotation' '-rewrite=^androidx.appcompat:appcompat$=androidx.appcompat_appcompat' '-rewrite=^androidx.appcompat:appcompat-resources$=androidx.appcompat_appcompat-resources' '-rewrite=^androidx.arch.core:core-common$=androidx.arch.core_core-common' '-rewrite=^androidx.arch.core:core-runtime$=androidx.arch.core_core-runtime' '-rewrite=^androidx.asynclayoutinflater:asynclayoutinflater$=androidx.asynclayoutinflater_asynclayoutinflater' '-rewrite=^androidx.autofill:autofill$=androidx.autofill_autofill' '-rewrite=^androidx.biometric:biometric$=androidx.biometric_biometric' '-rewrite=^androidx.browser:browser$=androidx.browser_browser' '-rewrite=^androidx.car:car$=androidx.car_car' '-rewrite=^androidx.car:car-cluster$=androidx.car_car-cluster' '-rewrite=^androidx.cardview:cardview$=androidx.cardview_cardview' '-rewrite=^androidx.collection:collection$=androidx.collection_collection' '-rewrite=^androidx.collection:collection-ktx$=androidx.collection_collection-ktx' '-rewrite=^androidx.concurrent:concurrent-futures$=androidx.concurrent_concurrent-futures' '-rewrite=^androidx.concurrent:concurrent-listenablefuture$=androidx.concurrent_concurrent-listenablefuture' '-rewrite=^androidx.concurrent:concurrent-listenablefuture-callback$=androidx.concurrent_concurrent-listenablefuture-callback' '-rewrite=^androidx.constraintlayout:constraintlayout$=androidx-constraintlayout_constraintlayout' '-rewrite=^androidx.constraintlayout:constraintlayout-solver$=androidx-constraintlayout_constraintlayout-solver' '-rewrite=^androidx.contentpaging:contentpaging$=androidx.contentpaging_contentpaging' '-rewrite=^androidx.coordinatorlayout:coordinatorlayout$=androidx.coordinatorlayout_coordinatorlayout' '-rewrite=^androidx.core:core$=androidx.core_core' '-rewrite=^androidx.core:core-ktx$=androidx.core_core-ktx' '-rewrite=^androidx.cursoradapter:cursoradapter$=androidx.cursoradapter_cursoradapter' '-rewrite=^androidx.customview:customview$=androidx.customview_customview' '-rewrite=^androidx.documentfile:documentfile$=androidx.documentfile_documentfile' '-rewrite=^androidx.drawerlayout:drawerlayout$=androidx.drawerlayout_drawerlayout' '-rewrite=^androidx.dynamicanimation:dynamicanimation$=androidx.dynamicanimation_dynamicanimation' '-rewrite=^androidx.emoji:emoji$=androidx.emoji_emoji' '-rewrite=^androidx.emoji:emoji-appcompat$=androidx.emoji_emoji-appcompat' '-rewrite=^androidx.emoji:emoji-bundled$=androidx.emoji_emoji-bundled' '-rewrite=^androidx.exifinterface:exifinterface$=androidx.exifinterface_exifinterface' '-rewrite=^androidx.fragment:fragment$=androidx.fragment_fragment' '-rewrite=^androidx.fragment:fragment-ktx$=androidx.fragment_fragment-ktx' '-rewrite=^androidx.gridlayout:gridlayout$=androidx.gridlayout_gridlayout' '-rewrite=^androidx.heifwriter:heifwriter$=androidx.heifwriter_heifwriter' '-rewrite=^androidx.interpolator:interpolator$=androidx.interpolator_interpolator' '-rewrite=^androidx.leanback:leanback$=androidx.leanback_leanback' '-rewrite=^androidx.leanback:leanback-preference$=androidx.leanback_leanback-preference' '-rewrite=^androidx.legacy:legacy-preference-v14$=androidx.legacy_legacy-preference-v14' '-rewrite=^androidx.legacy:legacy-support-core-ui$=androidx.legacy_legacy-support-core-ui' '-rewrite=^androidx.legacy:legacy-support-core-utils$=androidx.legacy_legacy-support-core-utils' '-rewrite=^androidx.legacy:legacy-support-v13$=androidx.legacy_legacy-support-v13' '-rewrite=^androidx.legacy:legacy-support-v4$=androidx.legacy_legacy-support-v4' '-rewrite=^androidx.lifecycle:lifecycle-common$=androidx.lifecycle_lifecycle-common' '-rewrite=^androidx.lifecycle:lifecycle-common-java8$=androidx.lifecycle_lifecycle-common-java8' '-rewrite=^androidx.lifecycle:lifecycle-extensions$=androidx.lifecycle_lifecycle-extensions' '-rewrite=^androidx.lifecycle:lifecycle-livedata$=androidx.lifecycle_lifecycle-livedata' '-rewrite=^androidx.lifecycle:lifecycle-livedata-core$=androidx.lifecycle_lifecycle-livedata-core' '-rewrite=^androidx.lifecycle:lifecycle-livedata-core-ktx$=androidx.lifecycle_lifecycle-livedata-core-ktx' '-rewrite=^androidx.lifecycle:lifecycle-livedata-ktx$=androidx.lifecycle_lifecycle-livedata-ktx' '-rewrite=^androidx.lifecycle:lifecycle-process$=androidx.lifecycle_lifecycle-process' '-rewrite=^androidx.lifecycle:lifecycle-runtime$=androidx.lifecycle_lifecycle-runtime' '-rewrite=^androidx.lifecycle:lifecycle-runtime-ktx$=androidx.lifecycle_lifecycle-runtime-ktx' '-rewrite=^androidx.lifecycle:lifecycle-service$=androidx.lifecycle_lifecycle-service' '-rewrite=^androidx.lifecycle:lifecycle-viewmodel$=androidx.lifecycle_lifecycle-viewmodel' '-rewrite=^androidx.lifecycle:lifecycle-viewmodel-ktx$=androidx.lifecycle_lifecycle-viewmodel-ktx' '-rewrite=^androidx.lifecycle:lifecycle-viewmodel-savedstate$=androidx.lifecycle_lifecycle-viewmodel-savedstate' '-rewrite=^androidx.loader:loader$=androidx.loader_loader' '-rewrite=^androidx.localbroadcastmanager:localbroadcastmanager$=androidx.localbroadcastmanager_localbroadcastmanager' '-rewrite=^androidx.media2:media2-common$=androidx.media2_media2-common' '-rewrite=^androidx.media2:media2-exoplayer$=androidx.media2_media2-exoplayer' '-rewrite=^androidx.media2:media2-player$=androidx.media2_media2-player' '-rewrite=^androidx.media2:media2-session$=androidx.media2_media2-session' '-rewrite=^androidx.media2:media2-widget$=androidx.media2_media2-widget' '-rewrite=^androidx.media:media$=androidx.media_media' '-rewrite=^androidx.mediarouter:mediarouter$=androidx.mediarouter_mediarouter' '-rewrite=^androidx.multidex:multidex$=androidx-multidex_multidex' '-rewrite=^androidx.multidex:multidex-instrumentation$=androidx-multidex_multidex-instrumentation' '-rewrite=^androidx.navigation:navigation-common$=androidx.navigation_navigation-common' '-rewrite=^androidx.navigation:navigation-common-ktx$=androidx.navigation_navigation-common-ktx' '-rewrite=^androidx.navigation:navigation-fragment$=androidx.navigation_navigation-fragment' '-rewrite=^androidx.navigation:navigation-fragment-ktx$=androidx.navigation_navigation-fragment-ktx' '-rewrite=^androidx.navigation:navigation-runtime$=androidx.navigation_navigation-runtime' '-rewrite=^androidx.navigation:navigation-runtime-ktx$=androidx.navigation_navigation-runtime-ktx' '-rewrite=^androidx.navigation:navigation-ui$=androidx.navigation_navigation-ui' '-rewrite=^androidx.navigation:navigation-ui-ktx$=androidx.navigation_navigation-ui-ktx' '-rewrite=^androidx.paging:paging-common$=androidx.paging_paging-common' '-rewrite=^androidx.paging:paging-common-ktx$=androidx.paging_paging-common-ktx' '-rewrite=^androidx.paging:paging-runtime$=androidx.paging_paging-runtime' '-rewrite=^androidx.palette:palette$=androidx.palette_palette' '-rewrite=^androidx.percentlayout:percentlayout$=androidx.percentlayout_percentlayout' '-rewrite=^androidx.preference:preference$=androidx.preference_preference' '-rewrite=^androidx.print:print$=androidx.print_print' '-rewrite=^androidx.recommendation:recommendation$=androidx.recommendation_recommendation' '-rewrite=^androidx.recyclerview:recyclerview$=androidx.recyclerview_recyclerview' '-rewrite=^androidx.recyclerview:recyclerview-selection$=androidx.recyclerview_recyclerview-selection' '-rewrite=^androidx.remotecallback:remotecallback$=androidx.remotecallback_remotecallback' '-rewrite=^androidx.remotecallback:remotecallback-processor$=androidx.remotecallback_remotecallback-processor' '-rewrite=^androidx.room:room-common$=androidx.room_room-common' '-rewrite=^androidx.room:room-compiler$=androidx.room_room-compiler' '-rewrite=^androidx.room:room-migration$=androidx.room_room-migration' '-rewrite=^androidx.room:room-runtime$=androidx.room_room-runtime' '-rewrite=^androidx.room:room-testing$=androidx.room_room-testing' '-rewrite=^androidx.savedstate:savedstate$=androidx.savedstate_savedstate' '-rewrite=^androidx.slice:slice-builders$=androidx.slice_slice-builders' '-rewrite=^androidx.slice:slice-core$=androidx.slice_slice-core' '-rewrite=^androidx.slice:slice-view$=androidx.slice_slice-view' '-rewrite=^androidx.slidingpanelayout:slidingpanelayout$=androidx.slidingpanelayout_slidingpanelayout' '-rewrite=^androidx.sqlite:sqlite$=androidx.sqlite_sqlite' '-rewrite=^androidx.sqlite:sqlite-framework$=androidx.sqlite_sqlite-framework' '-rewrite=^androidx.swiperefreshlayout:swiperefreshlayout$=androidx.swiperefreshlayout_swiperefreshlayout' '-rewrite=^androidx.textclassifier:textclassifier$=androidx.textclassifier_textclassifier' '-rewrite=^androidx.transition:transition$=androidx.transition_transition' '-rewrite=^androidx.tvprovider:tvprovider$=androidx.tvprovider_tvprovider' '-rewrite=^androidx.vectordrawable:vectordrawable$=androidx.vectordrawable_vectordrawable' '-rewrite=^androidx.vectordrawable:vectordrawable-animated$=androidx.vectordrawable_vectordrawable-animated' '-rewrite=^androidx.versionedparcelable:versionedparcelable$=androidx.versionedparcelable_versionedparcelable' '-rewrite=^androidx.viewpager:viewpager$=androidx.viewpager_viewpager' '-rewrite=^androidx.wear:wear$=androidx.wear_wear' '-rewrite=^androidx.webkit:webkit$=androidx.webkit_webkit' '-rewrite=^com.android.support.constraint:constraint-layout$=android-support-constraint-layout' '-rewrite=^com.android.support.constraint:constraint-layout-solver$=android-support-constraint-layout-solver' '-rewrite=^com.android.support:animated-vector-drawable$=android-support-animatedvectordrawable' '-rewrite=^com.android.support:appcompat-v7$=android-support-v7-appcompat' '-rewrite=^com.android.support:asynclayoutinflater$=android-support-asynclayoutinflater' '-rewrite=^com.android.support:car$=android-support-car' '-rewrite=^com.android.support:cardview-v7$=android-support-v7-cardview' '-rewrite=^com.android.support:collections$=android-support-collections' '-rewrite=^com.android.support:contentpaging$=android-support-contentpaging' '-rewrite=^com.android.support:coordinatorlayout$=android-support-coordinatorlayout' '-rewrite=^com.android.support:cursoradapter$=android-support-cursoradapter' '-rewrite=^com.android.support:customtabs$=android-support-customtabs' '-rewrite=^com.android.support:customview$=android-support-customview' '-rewrite=^com.android.support:design$=android-support-design' '-rewrite=^com.android.support:design-animation$=android-support-design-animation' '-rewrite=^com.android.support:design-bottomappbar$=android-support-design-bottomappbar' '-rewrite=^com.android.support:design-bottomnavigation$=android-support-design-bottomnavigation' '-rewrite=^com.android.support:design-bottomsheet$=android-support-design-bottomsheet' '-rewrite=^com.android.support:design-button$=android-support-design-button' '-rewrite=^com.android.support:design-canvas$=android-support-design-canvas' '-rewrite=^com.android.support:design-card$=android-support-design-card' '-rewrite=^com.android.support:design-chip$=android-support-design-chip' '-rewrite=^com.android.support:design-circularreveal$=android-support-design-circularreveal' '-rewrite=^com.android.support:design-circularreveal-cardview$=android-support-design-circularreveal-cardview' '-rewrite=^com.android.support:design-circularreveal-coordinatorlayout$=android-support-design-circularreveal-coordinatorlayout' '-rewrite=^com.android.support:design-color$=android-support-design-color' '-rewrite=^com.android.support:design-dialog$=android-support-design-dialog' '-rewrite=^com.android.support:design-drawable$=android-support-design-drawable' '-rewrite=^com.android.support:design-expandable$=android-support-design-expandable' '-rewrite=^com.android.support:design-floatingactionbutton$=android-support-design-floatingactionbutton' '-rewrite=^com.android.support:design-internal$=android-support-design-internal' '-rewrite=^com.android.support:design-math$=android-support-design-math' '-rewrite=^com.android.support:design-navigation$=android-support-design-navigation' '-rewrite=^com.android.support:design-resources$=android-support-design-resources' '-rewrite=^com.android.support:design-ripple$=android-support-design-ripple' '-rewrite=^com.android.support:design-shape$=android-support-design-shape' '-rewrite=^com.android.support:design-snackbar$=android-support-design-snackbar' '-rewrite=^com.android.support:design-stateful$=android-support-design-stateful' '-rewrite=^com.android.support:design-tabs$=android-support-design-tabs' '-rewrite=^com.android.support:design-textfield$=android-support-design-textfield' '-rewrite=^com.android.support:design-theme$=android-support-design-theme' '-rewrite=^com.android.support:design-transformation$=android-support-design-transformation' '-rewrite=^com.android.support:design-typography$=android-support-design-typography' '-rewrite=^com.android.support:design-widget$=android-support-design-widget' '-rewrite=^com.android.support:documentfile$=android-support-documentfile' '-rewrite=^com.android.support:drawerlayout$=android-support-drawerlayout' '-rewrite=^com.android.support:exifinterface$=android-support-exifinterface' '-rewrite=^com.android.support:gridlayout-v7$=android-support-v7-gridlayout' '-rewrite=^com.android.support:heifwriter$=android-support-heifwriter' '-rewrite=^com.android.support:interpolator$=android-support-interpolator' '-rewrite=^com.android.support:leanback-v17$=android-support-v17-leanback' '-rewrite=^com.android.support:loader$=android-support-loader' '-rewrite=^com.android.support:localbroadcastmanager$=android-support-localbroadcastmanager' '-rewrite=^com.android.support:mediarouter-v7$=android-support-v7-mediarouter' '-rewrite=^com.android.support:multidex$=android-support-multidex' '-rewrite=^com.android.support:multidex-instrumentation$=android-support-multidex-instrumentation' '-rewrite=^com.android.support:palette-v7$=android-support-v7-palette' '-rewrite=^com.android.support:percent$=android-support-percent' '-rewrite=^com.android.support:preference-leanback-v17$=android-support-v17-preference-leanback' '-rewrite=^com.android.support:preference-v14$=android-support-v14-preference' '-rewrite=^com.android.support:preference-v7$=android-support-v7-preference' '-rewrite=^com.android.support:print$=android-support-print' '-rewrite=^com.android.support:recommendation$=android-support-recommendation' '-rewrite=^com.android.support:recyclerview-selection$=android-support-recyclerview-selection' '-rewrite=^com.android.support:recyclerview-v7$=android-support-v7-recyclerview' '-rewrite=^com.android.support:slices-builders$=android-slices-builders' '-rewrite=^com.android.support:slices-core$=android-slices-core' '-rewrite=^com.android.support:slices-view$=android-slices-view' '-rewrite=^com.android.support:slidingpanelayout$=android-support-slidingpanelayout' '-rewrite=^com.android.support:support-annotations$=android-support-annotations' '-rewrite=^com.android.support:support-compat$=android-support-compat' '-rewrite=^com.android.support:support-content$=android-support-support-content' '-rewrite=^com.android.support:support-core-ui$=android-support-core-ui' '-rewrite=^com.android.support:support-core-utils$=android-support-core-utils' '-rewrite=^com.android.support:support-dynamic-animation$=android-support-dynamic-animation' '-rewrite=^com.android.support:support-emoji$=android-support-emoji' '-rewrite=^com.android.support:support-emoji-appcompat$=android-support-emoji-appcompat' '-rewrite=^com.android.support:support-emoji-bundled$=android-support-emoji-bundled' '-rewrite=^com.android.support:support-fragment$=android-support-fragment' '-rewrite=^com.android.support:support-media-compat$=android-support-media-compat' '-rewrite=^com.android.support:support-tv-provider$=android-support-tv-provider' '-rewrite=^com.android.support:support-v13$=android-support-v13' '-rewrite=^com.android.support:support-v4$=android-support-v4' '-rewrite=^com.android.support:support-vector-drawable$=android-support-vectordrawable' '-rewrite=^com.android.support:swiperefreshlayout$=android-support-swiperefreshlayout' '-rewrite=^com.android.support:textclassifier$=android-support-textclassifier' '-rewrite=^com.android.support:transition$=android-support-transition' '-rewrite=^com.android.support:versionedparcelable$=android-versionedparcelable' '-rewrite=^com.android.support:viewpager$=android-support-viewpager' '-rewrite=^com.android.support:wear$=android-support-wear' '-rewrite=^com.android.support:webkit$=android-support-webkit' '-rewrite=^com.google.android.material:material$=com.google.android.material_material' '-rewrite=^com.google.android:flexbox$=flexbox' '-rewrite=^com.squareup:javapoet$=javapoet-prebuilt-jar' '-rewrite=^com.google.guava:listenablefuture$=guava-listenablefuture-prebuilt-jar' '-rewrite=^sqlite-jdbc$=xerial-sqlite-jdbc' '-rewrite=^gson$=gson-prebuilt-jar' -extra-static-libs=android-support-car=prebuilt-android.car-stubs -extra-static-libs=androidx.room_room-compiler=guava-21.0,jetbrains-annotations '-host=androidx.remotecallback:remotecallback-processor' '-host=androidx.room:room-compiler' '-host-and-device=androidx.annotation:annotation' '-host-and-device=androidx.room:room-common' '-host-and-device=androidx.room:room-migration' -exclude=android-arch-room-migration -exclude=android-arch-room-testing .
android_library_import {
name: "androidx.activity_activity-ktx-nodeps",
@@ -2074,7 +2074,7 @@
"javapoet-prebuilt-jar",
"antlr4",
"xerial-sqlite-jdbc",
- "kotlin-metadata",
+ "kotlinx-metadata-jvm",
"commons-codec",
"annotations",
"guava-21.0",
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index c55cc01..80e243e 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -442,7 +442,6 @@
args.extend(["-rewrite=^com.squareup:javapoet$=javapoet-prebuilt-jar"])
args.extend(["-rewrite=^com.google.guava:listenablefuture$=guava-listenablefuture-prebuilt-jar"])
args.extend(["-rewrite=^sqlite-jdbc$=xerial-sqlite-jdbc"])
- args.extend(["-rewrite=^kotlinx-metadata-jvm$=kotlin-metadata"])
args.extend(["-rewrite=^gson$=gson-prebuilt-jar"])
args.extend(["-extra-static-libs=android-support-car=prebuilt-android.car-stubs"])
# remove jetbrains-annotations after b/144726918 is fixed