Merge "Update design library dependencies using latest pom2mk" into pi-dev
diff --git a/current/extras/material-design-x/Android.mk b/current/extras/material-design-x/Android.mk
index b9e3977..9ad1c02 100644
--- a/current/extras/material-design-x/Android.mk
+++ b/current/extras/material-design-x/Android.mk
@@ -34,7 +34,10 @@
androidx.legacy_legacy-support-core-ui \
androidx.appcompat_appcompat \
androidx.design_design-resources \
- androidx.design_design-widget
+ androidx.design_design-widget \
+ androidx.design_design-expandable \
+ androidx.design_design-internal \
+ androidx.design_design-shape
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -46,8 +49,10 @@
LOCAL_MODULE_SUFFIX := .aar
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ androidx.annotation_annotation
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -60,7 +65,9 @@
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat \
+ androidx.design_design-dialog
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -72,8 +79,15 @@
LOCAL_MODULE_SUFFIX := .aar
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ androidx.annotation_annotation
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.core_core \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.appcompat_appcompat \
+ androidx.design_design-internal \
+ androidx.design_design-resources \
+ androidx.design_design-ripple
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -105,7 +119,8 @@
androidx.legacy_legacy-support-core-utils \
androidx.appcompat_appcompat \
androidx.cardview_cardview \
- androidx.design_design-resources
+ androidx.design_design-resources \
+ androidx.design_design-internal
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -117,8 +132,18 @@
LOCAL_MODULE_SUFFIX := .aar
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ androidx.annotation_annotation
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.core_core \
+ androidx.appcompat_appcompat \
+ androidx.design_design-animation \
+ androidx.design_design-canvas \
+ androidx.design_design-color \
+ androidx.design_design-drawable \
+ androidx.design_design-internal \
+ androidx.design_design-resources \
+ androidx.design_design-ripple
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -191,7 +216,18 @@
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-button \
+ androidx.design_design-card \
+ androidx.design_design-chip \
+ androidx.design_design-color \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-navigation \
+ androidx.design_design-tabs \
+ androidx.design_design-textfield \
+ androidx.design_design-typography
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -217,8 +253,10 @@
LOCAL_MODULE_SUFFIX := .aar
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ androidx.annotation_annotation
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.legacy_legacy-support-core-ui
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -231,7 +269,10 @@
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat \
+ androidx.design_design-animation \
+ androidx.design_design-color
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -243,8 +284,15 @@
LOCAL_MODULE_SUFFIX := .aar
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ androidx.annotation_annotation
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.transition_transition \
+ androidx.appcompat_appcompat \
+ androidx.recyclerview_recyclerview \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-color \
+ androidx.design_design-snackbar
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -270,7 +318,8 @@
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -359,7 +408,8 @@
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -372,7 +422,8 @@
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -384,8 +435,21 @@
LOCAL_MODULE_SUFFIX := .aar
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ androidx.annotation_annotation
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-bottomsheet \
+ androidx.design_design-button \
+ androidx.design_design-card \
+ androidx.design_design-chip \
+ androidx.design_design-color \
+ androidx.design_design-dialog \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-navigation \
+ androidx.design_design-typography \
+ androidx.design_design-widget
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -397,8 +461,17 @@
LOCAL_MODULE_SUFFIX := .aar
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ androidx.annotation_annotation
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.core_core \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.design_design-animation \
+ androidx.design_design-circularreveal \
+ androidx.design_design-circularreveal-cardview \
+ androidx.design_design-expandable \
+ androidx.design_design-math \
+ androidx.design_design-widget
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -411,7 +484,8 @@
LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES :=
-LOCAL_STATIC_ANDROID_LIBRARIES :=
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.appcompat_appcompat
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -441,7 +515,16 @@
androidx.design_design-resources \
androidx.design_design-ripple \
androidx.design_design-snackbar \
- androidx.design_design-stateful
+ androidx.design_design-stateful \
+ androidx.design_design-bottomsheet \
+ androidx.design_design-color \
+ androidx.design_design-dialog \
+ androidx.design_design-expandable \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-internal \
+ androidx.design_design-navigation \
+ androidx.design_design-tabs \
+ androidx.design_design-textfield
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
@@ -490,5 +573,7 @@
androidx.design_design-theme \
androidx.design_design-transformation \
androidx.design_design-typography \
- androidx.design_design-widget
+ androidx.design_design-widget \
+ androidx.design_design-internal \
+ androidx.design_design-shape
include $(BUILD_PREBUILT)
diff --git a/current/fix_dependencies.mk b/current/fix_dependencies.mk
index 00e02ec..2ab5e85 100644
--- a/current/fix_dependencies.mk
+++ b/current/fix_dependencies.mk
@@ -2814,10 +2814,12 @@
androidx.design_design-drawable \
androidx.design_design-expandable \
androidx.design_design-floatingactionbutton \
+ androidx.design_design-internal \
androidx.design_design-math \
androidx.design_design-navigation \
androidx.design_design-resources \
androidx.design_design-ripple \
+ androidx.design_design-shape \
androidx.design_design-snackbar \
androidx.design_design-stateful \
androidx.design_design-tabs \
@@ -2895,13 +2897,29 @@
androidx.design_design-animation \
androidx.design_design-bottomappbar \
androidx.design_design-bottomnavigation \
+ androidx.design_design-bottomsheet \
+ androidx.design_design-button \
+ androidx.design_design-canvas \
+ androidx.design_design-card \
+ androidx.design_design-chip \
androidx.design_design-circularreveal \
androidx.design_design-circularreveal-cardview \
+ androidx.design_design-color \
+ androidx.design_design-dialog \
+ androidx.design_design-drawable \
+ androidx.design_design-expandable \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-internal \
androidx.design_design-math \
+ androidx.design_design-navigation \
androidx.design_design-resources \
androidx.design_design-ripple \
+ androidx.design_design-shape \
androidx.design_design-snackbar \
androidx.design_design-stateful \
+ androidx.design_design-tabs \
+ androidx.design_design-textfield \
+ androidx.design_design-typography \
androidx.design_design-widget \
androidx.documentfile_documentfile \
androidx.drawerlayout_drawerlayout \
@@ -2931,38 +2949,14 @@
ifneq (,$(filter androidx.design_design-bottomnavigation,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-bottomnavigation
-endif
-
-ifneq (,$(filter androidx.design_design-bottomsheet,$(requested_support_libs)))
- support_android_deps += \
- androidx.design_design-bottomsheet
-endif
-
-ifneq (,$(filter androidx.design_design-button,$(requested_support_libs)))
- support_android_deps += \
- androidx.design_design-button
-endif
-
-ifneq (,$(filter androidx.design_design-canvas,$(requested_support_libs)))
- support_android_deps += \
- androidx.design_design-canvas
- support_java_deps += \
- androidx.annotation_annotation
-endif
-
-ifneq (,$(filter androidx.design_design-card,$(requested_support_libs)))
- support_android_deps += \
androidx.appcompat_appcompat \
androidx.arch.core_core-runtime \
androidx.asynclayoutinflater_asynclayoutinflater \
- androidx.cardview_cardview \
androidx.coordinatorlayout_coordinatorlayout \
androidx.core_core \
androidx.cursoradapter_cursoradapter \
androidx.customview_customview \
- androidx.design_design-card \
- androidx.design_design-resources \
+ androidx.design_design-bottomnavigation \
androidx.documentfile_documentfile \
androidx.drawerlayout_drawerlayout \
androidx.fragment_fragment \
@@ -2987,9 +2981,195 @@
androidx.lifecycle_lifecycle-common
endif
+ifneq (,$(filter androidx.design_design-bottomsheet,$(requested_support_libs)))
+ support_android_deps += \
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.cardview_cardview \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-animation \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-bottomsheet \
+ androidx.design_design-button \
+ androidx.design_design-canvas \
+ androidx.design_design-card \
+ androidx.design_design-chip \
+ androidx.design_design-color \
+ androidx.design_design-dialog \
+ androidx.design_design-drawable \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-internal \
+ androidx.design_design-navigation \
+ androidx.design_design-resources \
+ androidx.design_design-ripple \
+ androidx.design_design-snackbar \
+ androidx.design_design-tabs \
+ androidx.design_design-textfield \
+ androidx.design_design-typography \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.recyclerview_recyclerview \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.transition_transition \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
+endif
+
+ifneq (,$(filter androidx.design_design-button,$(requested_support_libs)))
+ support_android_deps += \
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-button \
+ androidx.design_design-color \
+ androidx.design_design-internal \
+ androidx.design_design-resources \
+ androidx.design_design-ripple \
+ androidx.design_design-snackbar \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.recyclerview_recyclerview \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.transition_transition \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
+endif
+
+ifneq (,$(filter androidx.design_design-canvas,$(requested_support_libs)))
+ support_android_deps += \
+ androidx.design_design-canvas
+ support_java_deps += \
+ androidx.annotation_annotation
+endif
+
+ifneq (,$(filter androidx.design_design-card,$(requested_support_libs)))
+ support_android_deps += \
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.cardview_cardview \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-card \
+ androidx.design_design-color \
+ androidx.design_design-internal \
+ androidx.design_design-resources \
+ androidx.design_design-snackbar \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.recyclerview_recyclerview \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.transition_transition \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
+endif
+
ifneq (,$(filter androidx.design_design-chip,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-chip
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-animation \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-canvas \
+ androidx.design_design-chip \
+ androidx.design_design-color \
+ androidx.design_design-drawable \
+ androidx.design_design-internal \
+ androidx.design_design-resources \
+ androidx.design_design-ripple \
+ androidx.design_design-snackbar \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.recyclerview_recyclerview \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.transition_transition \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-circularreveal,$(requested_support_libs)))
@@ -3049,7 +3229,56 @@
ifneq (,$(filter androidx.design_design-dialog,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-dialog
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.cardview_cardview \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-animation \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-button \
+ androidx.design_design-canvas \
+ androidx.design_design-card \
+ androidx.design_design-chip \
+ androidx.design_design-color \
+ androidx.design_design-dialog \
+ androidx.design_design-drawable \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-internal \
+ androidx.design_design-navigation \
+ androidx.design_design-resources \
+ androidx.design_design-ripple \
+ androidx.design_design-snackbar \
+ androidx.design_design-tabs \
+ androidx.design_design-textfield \
+ androidx.design_design-typography \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.recyclerview_recyclerview \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.transition_transition \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-drawable,$(requested_support_libs)))
@@ -3061,17 +3290,107 @@
ifneq (,$(filter androidx.design_design-expandable,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-expandable
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-expandable \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-floatingactionbutton,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-floatingactionbutton
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-animation \
+ androidx.design_design-color \
+ androidx.design_design-floatingactionbutton \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-internal,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-internal
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-color \
+ androidx.design_design-internal \
+ androidx.design_design-snackbar \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.recyclerview_recyclerview \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.transition_transition \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-math,$(requested_support_libs)))
@@ -3081,7 +3400,36 @@
ifneq (,$(filter androidx.design_design-navigation,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-navigation
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-navigation \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-resources,$(requested_support_libs)))
@@ -3209,27 +3557,228 @@
ifneq (,$(filter androidx.design_design-tabs,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-tabs
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-tabs \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-textfield,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-textfield
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-textfield \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-theme,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-theme
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.cardview_cardview \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-animation \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-bottomsheet \
+ androidx.design_design-button \
+ androidx.design_design-canvas \
+ androidx.design_design-card \
+ androidx.design_design-chip \
+ androidx.design_design-circularreveal \
+ androidx.design_design-circularreveal-cardview \
+ androidx.design_design-color \
+ androidx.design_design-dialog \
+ androidx.design_design-drawable \
+ androidx.design_design-expandable \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-internal \
+ androidx.design_design-math \
+ androidx.design_design-navigation \
+ androidx.design_design-resources \
+ androidx.design_design-ripple \
+ androidx.design_design-snackbar \
+ androidx.design_design-stateful \
+ androidx.design_design-tabs \
+ androidx.design_design-textfield \
+ androidx.design_design-theme \
+ androidx.design_design-typography \
+ androidx.design_design-widget \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.recyclerview_recyclerview \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.transition_transition \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-transformation,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-transformation
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.cardview_cardview \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-animation \
+ androidx.design_design-bottomnavigation \
+ androidx.design_design-bottomsheet \
+ androidx.design_design-button \
+ androidx.design_design-canvas \
+ androidx.design_design-card \
+ androidx.design_design-chip \
+ androidx.design_design-circularreveal \
+ androidx.design_design-circularreveal-cardview \
+ androidx.design_design-color \
+ androidx.design_design-dialog \
+ androidx.design_design-drawable \
+ androidx.design_design-expandable \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-internal \
+ androidx.design_design-math \
+ androidx.design_design-navigation \
+ androidx.design_design-resources \
+ androidx.design_design-ripple \
+ androidx.design_design-snackbar \
+ androidx.design_design-stateful \
+ androidx.design_design-tabs \
+ androidx.design_design-textfield \
+ androidx.design_design-transformation \
+ androidx.design_design-typography \
+ androidx.design_design-widget \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.recyclerview_recyclerview \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.transition_transition \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-typography,$(requested_support_libs)))
support_android_deps += \
- androidx.design_design-typography
+ androidx.appcompat_appcompat \
+ androidx.arch.core_core-runtime \
+ androidx.asynclayoutinflater_asynclayoutinflater \
+ androidx.coordinatorlayout_coordinatorlayout \
+ androidx.core_core \
+ androidx.cursoradapter_cursoradapter \
+ androidx.customview_customview \
+ androidx.design_design-typography \
+ androidx.documentfile_documentfile \
+ androidx.drawerlayout_drawerlayout \
+ androidx.fragment_fragment \
+ androidx.interpolator_interpolator \
+ androidx.legacy_legacy-support-core-ui \
+ androidx.legacy_legacy-support-core-utils \
+ androidx.lifecycle_lifecycle-livedata-core \
+ androidx.lifecycle_lifecycle-runtime \
+ androidx.lifecycle_lifecycle-viewmodel \
+ androidx.loader_loader \
+ androidx.localbroadcastmanager_localbroadcastmanager \
+ androidx.print_print \
+ androidx.slidingpanelayout_slidingpanelayout \
+ androidx.swiperefreshlayout_swiperefreshlayout \
+ androidx.vectordrawable_vectordrawable \
+ androidx.vectordrawable_vectordrawable-animated \
+ androidx.viewpager_viewpager
+ support_java_deps += \
+ androidx.annotation_annotation \
+ androidx.arch.core_core-common \
+ androidx.collection_collection \
+ androidx.lifecycle_lifecycle-common
endif
ifneq (,$(filter androidx.design_design-widget,$(requested_support_libs)))
@@ -3244,13 +3793,28 @@
androidx.customview_customview \
androidx.design_design-animation \
androidx.design_design-bottomnavigation \
+ androidx.design_design-bottomsheet \
+ androidx.design_design-button \
+ androidx.design_design-canvas \
+ androidx.design_design-card \
+ androidx.design_design-chip \
androidx.design_design-circularreveal \
androidx.design_design-circularreveal-cardview \
+ androidx.design_design-color \
+ androidx.design_design-dialog \
+ androidx.design_design-drawable \
+ androidx.design_design-expandable \
+ androidx.design_design-floatingactionbutton \
+ androidx.design_design-internal \
androidx.design_design-math \
+ androidx.design_design-navigation \
androidx.design_design-resources \
androidx.design_design-ripple \
androidx.design_design-snackbar \
androidx.design_design-stateful \
+ androidx.design_design-tabs \
+ androidx.design_design-textfield \
+ androidx.design_design-typography \
androidx.design_design-widget \
androidx.documentfile_documentfile \
androidx.drawerlayout_drawerlayout \