Merge "Add com.android.future.usb.accessory api files" am: 6f5cc30299 am: 8cfa7e84b4
am: bcba8806ea
Change-Id: I90885016b58e40c142e74a3fdfe9edad519e8a06
diff --git a/28/public/api/android.txt b/28/public/api/android.txt
index 26e4298..d41372b 100644
--- a/28/public/api/android.txt
+++ b/28/public/api/android.txt
@@ -14187,13 +14187,11 @@
ctor public Picture();
ctor public Picture(android.graphics.Picture);
method public android.graphics.Canvas beginRecording(int, int);
- method public static deprecated android.graphics.Picture createFromStream(java.io.InputStream);
method public void draw(android.graphics.Canvas);
method public void endRecording();
method public int getHeight();
method public int getWidth();
method public boolean requiresHardwareAcceleration();
- method public deprecated void writeToStream(java.io.OutputStream);
}
public class PixelFormat {
diff --git a/current/core/android.jar b/current/core/android.jar
index cc5fc8c..66a85b3 100644
--- a/current/core/android.jar
+++ b/current/core/android.jar
Binary files differ
diff --git a/current/definitions.mk b/current/definitions.mk
index b12c113..c71c0de 100644
--- a/current/definitions.mk
+++ b/current/definitions.mk
@@ -63,3 +63,4 @@
# android-support-car.
ANDROID_SUPPORT_CAR_TARGETS := \
android-support-car
+
diff --git a/current/extras/constraint-layout-x/Android.bp b/current/extras/constraint-layout-x/Android.bp
index 910d333..78d8f70 100644
--- a/current/extras/constraint-layout-x/Android.bp
+++ b/current/extras/constraint-layout-x/Android.bp
@@ -1,9 +1,24 @@
// 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.annotation:annotation$=androidx.annotation_annotation' '-rewrite=^androidx.appcompat:appcompat$=androidx.appcompat_appcompat' '-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.browser:browser$=androidx.browser_browser' '-rewrite=^androidx.car:car$=androidx.car_car' '-rewrite=^androidx.cardview:cardview$=androidx.cardview_cardview' '-rewrite=^androidx.collection:collection$=androidx.collection_collection' '-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.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.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-process$=androidx.lifecycle_lifecycle-process' '-rewrite=^androidx.lifecycle:lifecycle-runtime$=androidx.lifecycle_lifecycle-runtime' '-rewrite=^androidx.lifecycle:lifecycle-service$=androidx.lifecycle_lifecycle-service' '-rewrite=^androidx.lifecycle:lifecycle-viewmodel$=androidx.lifecycle_lifecycle-viewmodel' '-rewrite=^androidx.loader:loader$=androidx.loader_loader' '-rewrite=^androidx.localbroadcastmanager:localbroadcastmanager$=androidx.localbroadcastmanager_localbroadcastmanager' '-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.paging:paging-common$=androidx.paging_paging-common' '-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.room:room-common$=androidx.room_room-common' '-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.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.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:viewpager$=android-support-viewpager' '-rewrite=^com.android.support:wear$=android-support-wear' '-rewrite=^com.android.support:webkit$=android-support-webkit' '-rewrite=^com.android.temp.support:design$=androidx.design_design' '-rewrite=^com.android.temp.support:design-animation$=androidx.design_design-animation' '-rewrite=^com.android.temp.support:design-bottomappbar$=androidx.design_design-bottomappbar' '-rewrite=^com.android.temp.support:design-bottomnavigation$=androidx.design_design-bottomnavigation' '-rewrite=^com.android.temp.support:design-bottomsheet$=androidx.design_design-bottomsheet' '-rewrite=^com.android.temp.support:design-button$=androidx.design_design-button' '-rewrite=^com.android.temp.support:design-canvas$=androidx.design_design-canvas' '-rewrite=^com.android.temp.support:design-card$=androidx.design_design-card' '-rewrite=^com.android.temp.support:design-chip$=androidx.design_design-chip' '-rewrite=^com.android.temp.support:design-circularreveal$=androidx.design_design-circularreveal' '-rewrite=^com.android.temp.support:design-circularreveal-cardview$=androidx.design_design-circularreveal-cardview' '-rewrite=^com.android.temp.support:design-circularreveal-coordinatorlayout$=androidx.design_design-circularreveal-coordinatorlayout' '-rewrite=^com.android.temp.support:design-color$=androidx.design_design-color' '-rewrite=^com.android.temp.support:design-dialog$=androidx.design_design-dialog' '-rewrite=^com.android.temp.support:design-drawable$=androidx.design_design-drawable' '-rewrite=^com.android.temp.support:design-expandable$=androidx.design_design-expandable' '-rewrite=^com.android.temp.support:design-floatingactionbutton$=androidx.design_design-floatingactionbutton' '-rewrite=^com.android.temp.support:design-internal$=androidx.design_design-internal' '-rewrite=^com.android.temp.support:design-math$=androidx.design_design-math' '-rewrite=^com.android.temp.support:design-navigation$=androidx.design_design-navigation' '-rewrite=^com.android.temp.support:design-resources$=androidx.design_design-resources' '-rewrite=^com.android.temp.support:design-ripple$=androidx.design_design-ripple' '-rewrite=^com.android.temp.support:design-shape$=androidx.design_design-shape' '-rewrite=^com.android.temp.support:design-snackbar$=androidx.design_design-snackbar' '-rewrite=^com.android.temp.support:design-stateful$=androidx.design_design-stateful' '-rewrite=^com.android.temp.support:design-tabs$=androidx.design_design-tabs' '-rewrite=^com.android.temp.support:design-textfield$=androidx.design_design-textfield' '-rewrite=^com.android.temp.support:design-theme$=androidx.design_design-theme' '-rewrite=^com.android.temp.support:design-transformation$=androidx.design_design-transformation' '-rewrite=^com.android.temp.support:design-typography$=androidx.design_design-typography' '-rewrite=^com.android.temp.support:design-widget$=androidx.design_design-widget' '-rewrite=^com.google.android.material:material$=com.google.android.material_material' '-rewrite=^com.google.android:flexbox$=flexbox' -extra-deps=android-support-car=prebuilt-android.car-stubs -exclude=androidx.room_room-migration -exclude=androidx.room_room-testing -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.annotation:annotation$=androidx.annotation_annotation' '-rewrite=^androidx.appcompat:appcompat$=androidx.appcompat_appcompat' '-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.browser:browser$=androidx.browser_browser' '-rewrite=^androidx.car:car$=androidx.car_car' '-rewrite=^androidx.cardview:cardview$=androidx.cardview_cardview' '-rewrite=^androidx.collection:collection$=androidx.collection_collection' '-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.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.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-process$=androidx.lifecycle_lifecycle-process' '-rewrite=^androidx.lifecycle:lifecycle-runtime$=androidx.lifecycle_lifecycle-runtime' '-rewrite=^androidx.lifecycle:lifecycle-service$=androidx.lifecycle_lifecycle-service' '-rewrite=^androidx.lifecycle:lifecycle-viewmodel$=androidx.lifecycle_lifecycle-viewmodel' '-rewrite=^androidx.loader:loader$=androidx.loader_loader' '-rewrite=^androidx.localbroadcastmanager:localbroadcastmanager$=androidx.localbroadcastmanager_localbroadcastmanager' '-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.paging:paging-common$=androidx.paging_paging-common' '-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.room:room-common$=androidx.room_room-common' '-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.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.android.temp.support:design$=androidx.design_design' '-rewrite=^com.android.temp.support:design-animation$=androidx.design_design-animation' '-rewrite=^com.android.temp.support:design-bottomappbar$=androidx.design_design-bottomappbar' '-rewrite=^com.android.temp.support:design-bottomnavigation$=androidx.design_design-bottomnavigation' '-rewrite=^com.android.temp.support:design-bottomsheet$=androidx.design_design-bottomsheet' '-rewrite=^com.android.temp.support:design-button$=androidx.design_design-button' '-rewrite=^com.android.temp.support:design-canvas$=androidx.design_design-canvas' '-rewrite=^com.android.temp.support:design-card$=androidx.design_design-card' '-rewrite=^com.android.temp.support:design-chip$=androidx.design_design-chip' '-rewrite=^com.android.temp.support:design-circularreveal$=androidx.design_design-circularreveal' '-rewrite=^com.android.temp.support:design-circularreveal-cardview$=androidx.design_design-circularreveal-cardview' '-rewrite=^com.android.temp.support:design-circularreveal-coordinatorlayout$=androidx.design_design-circularreveal-coordinatorlayout' '-rewrite=^com.android.temp.support:design-color$=androidx.design_design-color' '-rewrite=^com.android.temp.support:design-dialog$=androidx.design_design-dialog' '-rewrite=^com.android.temp.support:design-drawable$=androidx.design_design-drawable' '-rewrite=^com.android.temp.support:design-expandable$=androidx.design_design-expandable' '-rewrite=^com.android.temp.support:design-floatingactionbutton$=androidx.design_design-floatingactionbutton' '-rewrite=^com.android.temp.support:design-internal$=androidx.design_design-internal' '-rewrite=^com.android.temp.support:design-math$=androidx.design_design-math' '-rewrite=^com.android.temp.support:design-navigation$=androidx.design_design-navigation' '-rewrite=^com.android.temp.support:design-resources$=androidx.design_design-resources' '-rewrite=^com.android.temp.support:design-ripple$=androidx.design_design-ripple' '-rewrite=^com.android.temp.support:design-shape$=androidx.design_design-shape' '-rewrite=^com.android.temp.support:design-snackbar$=androidx.design_design-snackbar' '-rewrite=^com.android.temp.support:design-stateful$=androidx.design_design-stateful' '-rewrite=^com.android.temp.support:design-tabs$=androidx.design_design-tabs' '-rewrite=^com.android.temp.support:design-textfield$=androidx.design_design-textfield' '-rewrite=^com.android.temp.support:design-theme$=androidx.design_design-theme' '-rewrite=^com.android.temp.support:design-transformation$=androidx.design_design-transformation' '-rewrite=^com.android.temp.support:design-typography$=androidx.design_design-typography' '-rewrite=^com.android.temp.support:design-widget$=androidx.design_design-widget' '-rewrite=^com.google.android.material:material$=com.google.android.material_material' '-rewrite=^com.google.android:flexbox$=flexbox' -extra-deps=android-support-car=prebuilt-android.car-stubs -exclude=androidx.room_room-migration -exclude=androidx.room_room-testing -exclude=android-arch-room-migration -exclude=android-arch-room-testing .
+
+java_import {
+ name: "androidx-constraintlayout_constraintlayout-solver-nodeps",
+ jars: ["constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar"],
+ sdk_version: "current",
+}
+
+java_library_static {
+ name: "androidx-constraintlayout_constraintlayout-solver",
+ sdk_version: "current",
+ static_libs: [
+ "androidx-constraintlayout_constraintlayout-solver-nodeps",
+ ],
+ java_version: "1.7",
+}
android_library_import {
name: "androidx-constraintlayout_constraintlayout-nodeps",
- aars: ["layout/constraintlayout-1.1.0.aar"],
+ aars: ["constraintlayout/1.1.2/constraintlayout-1.1.2.aar"],
sdk_version: "current",
static_libs: [
],
@@ -19,18 +34,3 @@
],
java_version: "1.7",
}
-
-java_import {
- name: "androidx-constraintlayout_constraintlayout-solver-nodeps",
- jars: ["solver/constraintlayout-solver-1.1.0.jar"],
- sdk_version: "current",
-}
-
-java_library_static {
- name: "androidx-constraintlayout_constraintlayout-solver",
- sdk_version: "current",
- static_libs: [
- "androidx-constraintlayout_constraintlayout-solver-nodeps",
- ],
- java_version: "1.7",
-}
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar
new file mode 100644
index 0000000..7ba051b
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar
Binary files differ
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar.md5 b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar.md5
new file mode 100644
index 0000000..202d39d
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar.md5
@@ -0,0 +1 @@
+90cb4a845a6574c90f0a06389ce92c43
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar.sha1 b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar.sha1
new file mode 100644
index 0000000..2526caf
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.jar.sha1
@@ -0,0 +1 @@
+d324137427d23f643b61a2ad1cb20df2b8b1eb97
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/solver/constraintlayout-solver-1.1.0.pom b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom
similarity index 96%
rename from current/extras/constraint-layout-x/solver/constraintlayout-solver-1.1.0.pom
rename to current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom
index 112d911..d84454c 100644
--- a/current/extras/constraint-layout-x/solver/constraintlayout-solver-1.1.0.pom
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.constraintlayout</groupId>
<artifactId>constraintlayout-solver</artifactId>
- <version>1.1.0</version>
+ <version>1.1.2</version>
<name>Android ConstraintLayout Solver</name>
<description>Solver for ConstraintLayout</description>
<url>http://tools.android.com</url>
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom.md5 b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom.md5
new file mode 100644
index 0000000..40b9310
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom.md5
@@ -0,0 +1 @@
+cf8e9c762798a22fee46073ae2f9b4dc
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom.sha1
new file mode 100644
index 0000000..886c9c9
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/1.1.2/constraintlayout-solver-1.1.2.pom.sha1
@@ -0,0 +1 @@
+27c694791521318c8ba906161687fe8fb3da8a6c
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar
new file mode 100644
index 0000000..a7932ff
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar
Binary files differ
diff --git a/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar.md5 b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar.md5
new file mode 100644
index 0000000..c4cfd0b
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar.md5
@@ -0,0 +1 @@
+221728a04a68bc602c066b2b388c9c56
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar.sha1 b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar.sha1
new file mode 100644
index 0000000..2e46be4
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.aar.sha1
@@ -0,0 +1 @@
+8890843da2da71c82e4503ad0899397991777cdc
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/layout/constraintlayout-1.1.0.pom b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom
similarity index 94%
rename from current/extras/constraint-layout-x/layout/constraintlayout-1.1.0.pom
rename to current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom
index 3d56bc9..fcf165a 100644
--- a/current/extras/constraint-layout-x/layout/constraintlayout-1.1.0.pom
+++ b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>androidx.constraintlayout</groupId>
<artifactId>constraintlayout</artifactId>
- <version>1.1.0</version>
+ <version>1.1.2</version>
<packaging>aar</packaging>
<name>Android ConstraintLayout</name>
<description>ConstraintLayout for Android</description>
@@ -30,7 +30,7 @@
<dependency>
<groupId>androidx.constraintlayout</groupId>
<artifactId>constraintlayout-solver</artifactId>
- <version>1.1.0</version>
+ <version>1.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom.md5 b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom.md5
new file mode 100644
index 0000000..d5cd3df
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom.md5
@@ -0,0 +1 @@
+948b7d8a33d3305fbdf7d3ba288d54fe
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom.sha1
new file mode 100644
index 0000000..929c29b
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/1.1.2/constraintlayout-1.1.2.pom.sha1
@@ -0,0 +1 @@
+5337fb44cb347ae175f394753e4abfb21fcea63d
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/layout/constraintlayout-1.1.0.aar b/current/extras/constraint-layout-x/layout/constraintlayout-1.1.0.aar
deleted file mode 100644
index 4373da9..0000000
--- a/current/extras/constraint-layout-x/layout/constraintlayout-1.1.0.aar
+++ /dev/null
Binary files differ
diff --git a/current/extras/constraint-layout-x/solver/constraintlayout-solver-1.1.0.jar b/current/extras/constraint-layout-x/solver/constraintlayout-solver-1.1.0.jar
deleted file mode 100644
index 376291b..0000000
--- a/current/extras/constraint-layout-x/solver/constraintlayout-solver-1.1.0.jar
+++ /dev/null
Binary files differ
diff --git a/current/public/android.jar b/current/public/android.jar
index 5409c26..3022665 100644
--- a/current/public/android.jar
+++ b/current/public/android.jar
Binary files differ
diff --git a/current/public/android.test.base.jar b/current/public/android.test.base.jar
index e765455..cf3a871 100644
--- a/current/public/android.test.base.jar
+++ b/current/public/android.test.base.jar
Binary files differ
diff --git a/current/public/android.test.mock.jar b/current/public/android.test.mock.jar
index dedea5e..7406bc7 100644
--- a/current/public/android.test.mock.jar
+++ b/current/public/android.test.mock.jar
Binary files differ
diff --git a/current/public/android.test.runner.jar b/current/public/android.test.runner.jar
index 9750a80..973a948 100644
--- a/current/public/android.test.runner.jar
+++ b/current/public/android.test.runner.jar
Binary files differ
diff --git a/current/public/framework.aidl b/current/public/framework.aidl
index 4caa50e..1f81087 100644
--- a/current/public/framework.aidl
+++ b/current/public/framework.aidl
@@ -15,18 +15,19 @@
parcelable android.app.AutomaticZenRule;
parcelable android.app.Fragment.SavedState;
parcelable android.app.Notification.Action;
-parcelable android.app.Notification.Person;
parcelable android.app.Notification;
parcelable android.app.NotificationChannel;
parcelable android.app.NotificationChannelGroup;
parcelable android.app.NotificationManager.Policy;
parcelable android.app.PendingIntent;
+parcelable android.app.Person;
parcelable android.app.PictureInPictureParams;
parcelable android.app.RemoteAction;
parcelable android.app.RemoteInput;
parcelable android.app.SearchableInfo;
parcelable android.app.VoiceInteractor.PickOptionRequest.Option;
parcelable android.app.VoiceInteractor.Prompt;
+parcelable android.app.Vr2dDisplayProperties;
parcelable android.app.WallpaperColors;
parcelable android.app.WallpaperInfo;
parcelable android.app.WindowConfiguration;
@@ -124,6 +125,7 @@
parcelable android.content.pm.SharedLibraryInfo;
parcelable android.content.pm.ShortcutInfo;
parcelable android.content.pm.Signature;
+parcelable android.content.pm.SigningInfo;
parcelable android.content.pm.VersionedPackage;
parcelable android.content.pm.permission.RuntimePermissionPresentationInfo;
parcelable android.content.res.AssetFileDescriptor;
@@ -195,6 +197,7 @@
parcelable android.media.AudioFormat;
parcelable android.media.AudioPlaybackConfiguration;
parcelable android.media.AudioRecordingConfiguration;
+parcelable android.media.BufferingParams;
parcelable android.media.MediaDescription;
parcelable android.media.MediaMetadata;
parcelable android.media.MediaPlayer.TrackInfo;
@@ -296,6 +299,9 @@
parcelable android.os.StrictMode.ViolationInfo;
parcelable android.os.UserHandle;
parcelable android.os.UserManager.EnforcingUser;
+parcelable android.os.VibrationEffect.OneShot;
+parcelable android.os.VibrationEffect.Prebaked;
+parcelable android.os.VibrationEffect.Waveform;
parcelable android.os.VibrationEffect;
parcelable android.os.WorkSource.WorkChain;
parcelable android.os.WorkSource;
@@ -480,14 +486,15 @@
parcelable android.view.inputmethod.InputMethodInfo;
parcelable android.view.inputmethod.InputMethodSubtype;
parcelable android.view.textclassifier.SelectionEvent;
-parcelable android.view.textclassifier.TextClassification.Options;
+parcelable android.view.textclassifier.TextClassification.Request;
parcelable android.view.textclassifier.TextClassification;
+parcelable android.view.textclassifier.TextClassificationContext;
parcelable android.view.textclassifier.TextClassificationSessionId;
parcelable android.view.textclassifier.TextClassifier.EntityConfig;
-parcelable android.view.textclassifier.TextLinks.Options;
+parcelable android.view.textclassifier.TextLinks.Request;
parcelable android.view.textclassifier.TextLinks.TextLink;
parcelable android.view.textclassifier.TextLinks;
-parcelable android.view.textclassifier.TextSelection.Options;
+parcelable android.view.textclassifier.TextSelection.Request;
parcelable android.view.textclassifier.TextSelection;
parcelable android.view.textservice.SentenceSuggestionsInfo;
parcelable android.view.textservice.SpellCheckerInfo;
diff --git a/current/public/org.apache.http.legacy.jar b/current/public/org.apache.http.legacy.jar
index 3f09fcb..5c3f0eb 100644
--- a/current/public/org.apache.http.legacy.jar
+++ b/current/public/org.apache.http.legacy.jar
Binary files differ
diff --git a/current/public/uiautomator.jar b/current/public/uiautomator.jar
index 6da538a..e350c07 100644
--- a/current/public/uiautomator.jar
+++ b/current/public/uiautomator.jar
Binary files differ
diff --git a/current/system/android.jar b/current/system/android.jar
index 0568186..8661a21 100644
--- a/current/system/android.jar
+++ b/current/system/android.jar
Binary files differ
diff --git a/current/system/android.test.mock.jar b/current/system/android.test.mock.jar
index 4a43346..90bdd77 100644
--- a/current/system/android.test.mock.jar
+++ b/current/system/android.test.mock.jar
Binary files differ
diff --git a/renderscript/Android.mk b/renderscript/Android.mk
index 2528e43..fb4b043 100644
--- a/renderscript/Android.mk
+++ b/renderscript/Android.mk
@@ -66,5 +66,19 @@
include $(BUILD_PREBUILT)
##################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := android-support-v8-renderscript-legacy
+LOCAL_SRC_FILES := lib/javalib_legacy.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .jar
+LOCAL_UNINSTALLABLE_MODULE := true
+# 23 as specified at frameworks/rs/support/Android.mk
+LOCAL_SDK_VERSION := 23
+
+include $(BUILD_PREBUILT)
+
+##################################
endif # TARGET_BUILD_APPS
diff --git a/renderscript/lib/javalib.jar b/renderscript/lib/javalib.jar
index 6ec52ee..a9aaf06 100644
--- a/renderscript/lib/javalib.jar
+++ b/renderscript/lib/javalib.jar
Binary files differ
diff --git a/renderscript/lib/javalib_legacy.jar b/renderscript/lib/javalib_legacy.jar
new file mode 100644
index 0000000..6ec52ee
--- /dev/null
+++ b/renderscript/lib/javalib_legacy.jar
Binary files differ
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index 9c8674b..e4de799 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -12,7 +12,7 @@
from functools import reduce
current_path = 'current'
-framework_sdk_target = 'sdk_mac'
+framework_sdk_target = 'sdk_phone_armv7-sdk_mac'
support_dir = os.path.join(current_path, 'support')
androidx_dir = os.path.join(current_path, 'androidx')
extras_dir = os.path.join(current_path, 'extras')
@@ -594,18 +594,27 @@
return True
-def update_constraint(target, build_id):
- layout_dir = fetch_and_extract(target, build_id.url_id,
- 'com.android.support.constraint-constraint-layout-%s.zip' % build_id.fs_id)
- solver_dir = fetch_and_extract(target, build_id.url_id,
- 'com.android.support.constraint-constraint-layout-solver-%s.zip' % build_id.fs_id)
- if not layout_dir or not solver_dir:
- print_e('Failed to extract Constraint Layout repositories')
+def update_constraint(target, build_id, local_file):
+ if build_id:
+ layout_dir = fetch_and_extract(target, build_id.url_id,
+ 'com.android.support.constraint-constraint-layout-%s.zip' % build_id.fs_id)
+ solver_dir = fetch_and_extract(target, build_id.url_id,
+ 'com.android.support.constraint-constraint-layout-solver-%s.zip' % build_id.fs_id)
+ if not layout_dir or not solver_dir:
+ print_e('Failed to extract Constraint Layout repositories')
return False
+ dirs = [layout_dir, solver_dir]
+ else:
+ repo_dir = extract_artifact(local_file)
+ if not repo_dir:
+ print_e('Failed to extract Constraint Layout')
+ return False
+ dirs = [repo_dir]
+
# Passing False here is an inelegant solution, but it means we can replace
# the top-level directory without worrying about other child directories.
- return transform_maven_repos([layout_dir, solver_dir],
+ return transform_maven_repos(dirs,
os.path.join(extras_dir, 'constraint-layout'), extract_res=False)
def update_constraint_x(local_file):
@@ -653,10 +662,14 @@
'core.current.stubs.jar': 'android.jar',
},
'public': {
+ 'android.test.base.stubs.jar': 'android.test.base.jar',
+ 'android.test.runner.stubs.jar': 'android.test.runner.jar',
+ 'android.test.mock.stubs.jar': 'android.test.mock.jar',
'apistubs/public/*.jar': '*',
},
'system': {
'android_system.jar': 'android.jar',
+ 'android.test.mock.stubs_system.jar': 'android.test.mock.jar',
'apistubs/system/*.jar': '*',
},
'test': {
@@ -849,7 +862,7 @@
try:
components = None
if args.constraint:
- if update_constraint('studio', getBuildId(args)):
+ if update_constraint('studio', getBuildId(args), getFile(args)):
components = append(components, 'Constraint Layout')
else:
print_e('Failed to update Constraint Layout, aborting...')