diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-16 18:07:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-16 18:07:16 +0000 |
| commit | c2b442515eebaa7bfb980b80fbc3c0beb4fa0961 (patch) | |
| tree | 8970898a90a860f6d588c3c2763e4cbdf0f58f13 | |
| parent | 8f3516097cf131bc317c34ce3a839d1d0a12de4e (diff) | |
| parent | 504a9b09569487e4cf2ef42059fe61ba77f60082 (diff) | |
| download | sdk-c2b442515eebaa7bfb980b80fbc3c0beb4fa0961.tar.gz | |
Merge "Update AndroidX from existing prebuilts" into main
255 files changed, 255 insertions, 5383 deletions
diff --git a/current/androidx/m2repository/androidx/activity/activity-compose/1.10.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/activity/activity-compose/1.10.0-alpha01/Android.bp index 0ef23b59b..d24ebb794 100644 --- a/current/androidx/m2repository/androidx/activity/activity-compose/1.10.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/activity/activity-compose/1.10.0-alpha01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.activity_activity-compose-nodeps", - aars: ["activity-compose-1.10.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity-ktx", - "androidx.compose.runtime_runtime", - "androidx.compose.runtime_runtime-saveable", - "androidx.compose.ui_ui", - "androidx.lifecycle_lifecycle-viewmodel", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.activity_activity-compose", + aars: ["activity-compose-1.10.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.activity_activity-compose-nodeps", "androidx.activity_activity-ktx", "androidx.compose.runtime_runtime", "androidx.compose.runtime_runtime-saveable", @@ -51,6 +31,4 @@ android_library { "androidx.lifecycle_lifecycle-viewmodel", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/activity/activity-ktx/1.10.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/activity/activity-ktx/1.10.0-alpha01/Android.bp index 934f519a8..2f7ee4699 100644 --- a/current/androidx/m2repository/androidx/activity/activity-ktx/1.10.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/activity/activity-ktx/1.10.0-alpha01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.activity_activity-ktx-nodeps", - aars: ["activity-ktx-1.10.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity", - "androidx.core_core-ktx", - "androidx.lifecycle_lifecycle-runtime-ktx", - "androidx.lifecycle_lifecycle-viewmodel-ktx", - "androidx.savedstate_savedstate-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.activity_activity-ktx", + aars: ["activity-ktx-1.10.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.activity_activity-ktx-nodeps", "androidx.activity_activity", "androidx.core_core-ktx", "androidx.lifecycle_lifecycle-runtime-ktx", @@ -51,6 +31,4 @@ android_library { "androidx.savedstate_savedstate-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/activity/activity/1.10.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/activity/activity/1.10.0-alpha01/Android.bp index 22012d6cf..d4e09639c 100644 --- a/current/androidx/m2repository/androidx/activity/activity/1.10.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/activity/activity/1.10.0-alpha01/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.activity_activity-nodeps", - aars: ["activity-1.10.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.lifecycle_lifecycle-runtime", - "androidx.lifecycle_lifecycle-viewmodel", - "androidx.lifecycle_lifecycle-viewmodel-savedstate", - "androidx.profileinstaller_profileinstaller", - "androidx.savedstate_savedstate", - "androidx.tracing_tracing", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.activity_activity", + aars: ["activity-1.10.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.activity_activity-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", @@ -59,6 +35,4 @@ android_library { "androidx.tracing_tracing", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/annotation/annotation-experimental/1.4.0-rc01/Android.bp b/current/androidx/m2repository/androidx/annotation/annotation-experimental/1.4.0-rc01/Android.bp index 3aa4a5fc9..2e6300967 100644 --- a/current/androidx/m2repository/androidx/annotation/annotation-experimental/1.4.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/annotation/annotation-experimental/1.4.0-rc01/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.annotation_annotation-experimental-nodeps", - aars: ["annotation-experimental-1.4.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.annotation_annotation-experimental", + aars: ["annotation-experimental-1.4.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.annotation_annotation-experimental-nodeps", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-beta01/Android.bp b/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-beta01/Android.bp index 456dcc675..07edd1bcd 100644 --- a/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-beta01/Android.bp @@ -15,19 +15,8 @@ package { } java_import { - name: "androidx.annotation_annotation-nodeps", - jars: ["annotation-jvm-1.8.0-beta01.jar"], - sdk_version: "34", - host_supported: true, - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.annotation_annotation", + jars: ["annotation-jvm-1.8.0-beta01.jar"], sdk_version: "34", host_supported: true, apex_available: [ @@ -36,9 +25,6 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.annotation_annotation-nodeps", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/appcompat/appcompat-resources/1.7.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appcompat/appcompat-resources/1.7.0-alpha04/Android.bp index 892e921ce..884fb0695 100644 --- a/current/androidx/m2repository/androidx/appcompat/appcompat-resources/1.7.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/appcompat/appcompat-resources/1.7.0-alpha04/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.appcompat_appcompat-resources-nodeps", - aars: ["appcompat-resources-1.7.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.vectordrawable_vectordrawable", - "androidx.vectordrawable_vectordrawable-animated", - ], -} - -android_library { name: "androidx.appcompat_appcompat-resources", + aars: ["appcompat-resources-1.7.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.appcompat_appcompat-resources-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.vectordrawable_vectordrawable", "androidx.vectordrawable_vectordrawable-animated", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/Android.bp index 68be42e41..a07f89948 100644 --- a/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/Android.bp @@ -15,46 +15,15 @@ package { } android_library_import { - name: "androidx.appcompat_appcompat-nodeps", - aars: ["appcompat-1.7.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity", - "androidx.annotation_annotation", - "androidx.appcompat_appcompat-resources", - "androidx.collection_collection", - "androidx.core_core", - "androidx.core_core-ktx", - "androidx.cursoradapter_cursoradapter", - "androidx.drawerlayout_drawerlayout", - "androidx.emoji2_emoji2", - "androidx.emoji2_emoji2-views-helper", - "androidx.fragment_fragment", - "androidx.lifecycle_lifecycle-runtime", - "androidx.lifecycle_lifecycle-viewmodel", - "androidx.profileinstaller_profileinstaller", - "androidx.resourceinspection_resourceinspection-annotation", - "androidx.savedstate_savedstate", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.appcompat_appcompat", + aars: ["appcompat-1.7.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.appcompat_appcompat-nodeps", "androidx.activity_activity", "androidx.annotation_annotation", "androidx.appcompat_appcompat-resources", @@ -73,6 +42,4 @@ android_library { "androidx.savedstate_savedstate", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch-builtin-types/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch-builtin-types/1.1.0-alpha04/Android.bp index 0465bc154..359aae27b 100644 --- a/current/androidx/m2repository/androidx/appsearch/appsearch-builtin-types/1.1.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/appsearch/appsearch-builtin-types/1.1.0-alpha04/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.appsearch_appsearch-builtin-types-nodeps", - aars: ["appsearch-builtin-types-1.1.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.appsearch_appsearch", - "androidx.core_core", - ], -} - -android_library { name: "androidx.appsearch_appsearch-builtin-types", + aars: ["appsearch-builtin-types-1.1.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.appsearch_appsearch-builtin-types-nodeps", "androidx.appsearch_appsearch", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch-compiler/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch-compiler/1.1.0-alpha04/Android.bp index b4e74774d..4eb84b4e8 100644 --- a/current/androidx/m2repository/androidx/appsearch/appsearch-compiler/1.1.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/appsearch/appsearch-compiler/1.1.0-alpha04/Android.bp @@ -15,15 +15,9 @@ package { } java_import_host { - name: "androidx.appsearch_appsearch-compiler-nodeps", - jars: ["appsearch-compiler-1.1.0-alpha04.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.appsearch_appsearch-compiler", + jars: ["appsearch-compiler-1.1.0-alpha04.jar"], static_libs: [ - "androidx.appsearch_appsearch-compiler-nodeps", "androidx.annotation_annotation", "auto_common", "auto_value_annotations", @@ -31,6 +25,4 @@ java_library_host { "javax-annotation-api-prebuilt-host-jar", "libauto_value_plugin", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/Android.bp index 56c5a05b0..f41388b83 100644 --- a/current/androidx/m2repository/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.appsearch_appsearch_local_storage-nodeps", - aars: ["appsearch-local-storage-1.1.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.appsearch_appsearch", - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - ], -} - -android_library { name: "androidx.appsearch_appsearch_local_storage", + aars: ["appsearch-local-storage-1.1.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.appsearch_appsearch_local_storage-nodeps", "androidx.annotation_annotation", "androidx.appsearch_appsearch", "androidx.collection_collection", "androidx.concurrent_concurrent-futures", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch-platform-storage/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch-platform-storage/1.1.0-alpha04/Android.bp index fa87ffbdf..9aee085b8 100644 --- a/current/androidx/m2repository/androidx/appsearch/appsearch-platform-storage/1.1.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/appsearch/appsearch-platform-storage/1.1.0-alpha04/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.appsearch_appsearch-platform-storage-nodeps", - aars: ["appsearch-platform-storage-1.1.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.appsearch_appsearch", - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - ], -} - -android_library { name: "androidx.appsearch_appsearch-platform-storage", + aars: ["appsearch-platform-storage-1.1.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.appsearch_appsearch-platform-storage-nodeps", "androidx.annotation_annotation", "androidx.appsearch_appsearch", "androidx.collection_collection", "androidx.concurrent_concurrent-futures", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch/1.1.0-alpha04/Android.bp index 1b065b530..68c4f8ce1 100644 --- a/current/androidx/m2repository/androidx/appsearch/appsearch/1.1.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/appsearch/appsearch/1.1.0-alpha04/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.appsearch_appsearch-nodeps", - aars: ["appsearch-1.1.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.appsearch_appsearch", + aars: ["appsearch-1.1.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.appsearch_appsearch-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.concurrent_concurrent-futures", "androidx.core_core", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/arch/core/core-common/2.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/arch/core/core-common/2.2.0-alpha01/Android.bp index 73daf3e49..4ab2958ab 100644 --- a/current/androidx/m2repository/androidx/arch/core/core-common/2.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/arch/core/core-common/2.2.0-alpha01/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.arch.core_core-common-nodeps", - jars: ["core-common-2.2.0-alpha01.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.arch.core_core-common", + jars: ["core-common-2.2.0-alpha01.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,9 +24,6 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.arch.core_core-common-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/arch/core/core-runtime/2.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/arch/core/core-runtime/2.2.0-alpha01/Android.bp index 9c5012b74..78c9d29cd 100644 --- a/current/androidx/m2repository/androidx/arch/core/core-runtime/2.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/arch/core/core-runtime/2.2.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.arch.core_core-runtime-nodeps", - aars: ["core-runtime-2.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.arch.core_core-common", - ], -} - -android_library { name: "androidx.arch.core_core-runtime", + aars: ["core-runtime-2.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.arch.core_core-runtime-nodeps", "androidx.annotation_annotation", "androidx.arch.core_core-common", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/arch/core/core-testing/2.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/arch/core/core-testing/2.2.0-alpha01/Android.bp index c26b25ccb..31ee949b8 100644 --- a/current/androidx/m2repository/androidx/arch/core/core-testing/2.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/arch/core/core-testing/2.2.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.arch.core_core-testing-nodeps", - aars: ["core-testing-2.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.arch.core_core-runtime", - "junit", - "mockito-core", - ], -} - -android_library { name: "androidx.arch.core_core-testing", + aars: ["core-testing-2.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.arch.core_core-testing-nodeps", "androidx.annotation_annotation", "androidx.arch.core_core-runtime", "junit", "mockito-core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/asynclayoutinflater/asynclayoutinflater/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/asynclayoutinflater/asynclayoutinflater/1.1.0-alpha02/Android.bp index cd716f72c..abd504446 100644 --- a/current/androidx/m2repository/androidx/asynclayoutinflater/asynclayoutinflater/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/asynclayoutinflater/asynclayoutinflater/1.1.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.asynclayoutinflater_asynclayoutinflater-nodeps", - aars: ["asynclayoutinflater-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - ], -} - -android_library { name: "androidx.asynclayoutinflater_asynclayoutinflater", + aars: ["asynclayoutinflater-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.asynclayoutinflater_asynclayoutinflater-nodeps", "androidx.annotation_annotation", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/autofill/autofill/1.2.0-beta02/Android.bp b/current/androidx/m2repository/androidx/autofill/autofill/1.2.0-beta02/Android.bp index 47cf1e0c6..2b2c5d954 100644 --- a/current/androidx/m2repository/androidx/autofill/autofill/1.2.0-beta02/Android.bp +++ b/current/androidx/m2repository/androidx/autofill/autofill/1.2.0-beta02/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.autofill_autofill-nodeps", - aars: ["autofill-1.2.0-beta02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.core_core", - ], -} - -android_library { name: "androidx.autofill_autofill", + aars: ["autofill-1.2.0-beta02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.autofill_autofill-nodeps", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/benchmark/benchmark-common/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/benchmark/benchmark-common/1.3.0-alpha02/Android.bp index 2213572e9..75b210871 100644 --- a/current/androidx/m2repository/androidx/benchmark/benchmark-common/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/benchmark/benchmark-common/1.3.0-alpha02/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.benchmark_benchmark-common-nodeps", - aars: ["benchmark-common-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.test.monitor", - "androidx.tracing_tracing-ktx", - "androidx.tracing_tracing-perfetto-handshake", - "kotlin-stdlib", - "wire-runtime", - ], -} - -android_library { name: "androidx.benchmark_benchmark-common", + aars: ["benchmark-common-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.benchmark_benchmark-common-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.test.monitor", @@ -53,6 +32,4 @@ android_library { "kotlin-stdlib", "wire-runtime", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/benchmark/benchmark-junit4/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/benchmark/benchmark-junit4/1.3.0-alpha02/Android.bp index 2e5891267..fafb0b9d7 100644 --- a/current/androidx/m2repository/androidx/benchmark/benchmark-junit4/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/benchmark/benchmark-junit4/1.3.0-alpha02/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.benchmark_benchmark-junit4-nodeps", - aars: ["benchmark-junit4-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.benchmark_benchmark-common", - "androidx.test.rules", - "androidx.test.runner", - "androidx.tracing_tracing-ktx", - "junit", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.benchmark_benchmark-junit4", + aars: ["benchmark-junit4-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.benchmark_benchmark-junit4-nodeps", "androidx.annotation_annotation", "androidx.benchmark_benchmark-common", "androidx.test.rules", @@ -53,6 +32,4 @@ android_library { "junit", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/benchmark/benchmark-macro-junit4/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/benchmark/benchmark-macro-junit4/1.3.0-alpha02/Android.bp index a9009da98..b695b35bc 100644 --- a/current/androidx/m2repository/androidx/benchmark/benchmark-macro-junit4/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/benchmark/benchmark-macro-junit4/1.3.0-alpha02/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.benchmark_benchmark-macro-junit4-nodeps", - aars: ["benchmark-macro-junit4-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "23", - static_libs: [ - "androidx.annotation_annotation", - "androidx.benchmark_benchmark-common", - "androidx.benchmark_benchmark-macro", - "androidx.test.rules", - "androidx.test.runner", - "androidx.test.uiautomator_uiautomator", - "junit", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.benchmark_benchmark-macro-junit4", + aars: ["benchmark-macro-junit4-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "23", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.benchmark_benchmark-macro-junit4-nodeps", "androidx.annotation_annotation", "androidx.benchmark_benchmark-common", "androidx.benchmark_benchmark-macro", @@ -55,6 +33,4 @@ android_library { "junit", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/benchmark/benchmark-macro/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/benchmark/benchmark-macro/1.3.0-alpha02/Android.bp index 0be506857..f3d97f078 100644 --- a/current/androidx/m2repository/androidx/benchmark/benchmark-macro/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/benchmark/benchmark-macro/1.3.0-alpha02/Android.bp @@ -15,42 +15,15 @@ package { } android_library_import { - name: "androidx.benchmark_benchmark-macro-nodeps", - aars: ["benchmark-macro-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "23", - static_libs: [ - "androidx.annotation_annotation", - "androidx.benchmark_benchmark-common", - "androidx.core_core", - "androidx.profileinstaller_profileinstaller", - "androidx.test.core", - "androidx.test.uiautomator_uiautomator", - "androidx.tracing_tracing-ktx", - "androidx.tracing_tracing-perfetto", - "androidx.tracing_tracing-perfetto-binary", - "androidx.tracing_tracing-perfetto-handshake", - "junit", - "kotlin-stdlib", - "wire-runtime", - ], -} - -android_library { name: "androidx.benchmark_benchmark-macro", + aars: ["benchmark-macro-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "23", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.benchmark_benchmark-macro-nodeps", "androidx.annotation_annotation", "androidx.benchmark_benchmark-common", "androidx.core_core", @@ -65,6 +38,4 @@ android_library { "kotlin-stdlib", "wire-runtime", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/biometric/biometric/1.2.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/biometric/biometric/1.2.0-alpha06/Android.bp index 739243838..8552f973b 100644 --- a/current/androidx/m2repository/androidx/biometric/biometric/1.2.0-alpha06/Android.bp +++ b/current/androidx/m2repository/androidx/biometric/biometric/1.2.0-alpha06/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.biometric_biometric-nodeps", - aars: ["biometric-1.2.0-alpha06.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity", - "androidx.annotation_annotation", - "androidx.appcompat_appcompat", - "androidx.core_core", - "androidx.fragment_fragment", - "androidx.lifecycle_lifecycle-common-java8", - "androidx.lifecycle_lifecycle-livedata-core", - "androidx.lifecycle_lifecycle-viewmodel", - ], -} - -android_library { name: "androidx.biometric_biometric", + aars: ["biometric-1.2.0-alpha06.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.biometric_biometric-nodeps", "androidx.activity_activity", "androidx.annotation_annotation", "androidx.appcompat_appcompat", @@ -55,6 +33,4 @@ android_library { "androidx.lifecycle_lifecycle-livedata-core", "androidx.lifecycle_lifecycle-viewmodel", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/browser/browser/1.9.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/browser/browser/1.9.0-alpha01/Android.bp index d8bcf0c63..d330417f8 100644 --- a/current/androidx/m2repository/androidx/browser/browser/1.9.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/browser/browser/1.9.0-alpha01/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.browser_browser-nodeps", - aars: ["browser-1.9.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "androidx.interpolator_interpolator", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.browser_browser", + aars: ["browser-1.9.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.browser_browser-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -53,6 +32,4 @@ android_library { "androidx.interpolator_interpolator", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-camera2-pipe-integration/1.0.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/camera/camera-camera2-pipe-integration/1.0.0-alpha01/Android.bp index 526d6d79b..480abc2f9 100644 --- a/current/androidx/m2repository/androidx/camera/camera-camera2-pipe-integration/1.0.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-camera2-pipe-integration/1.0.0-alpha01/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.camera_camera-camera2-pipe-integration-nodeps", - aars: ["camera-camera2-pipe-integration-1.0.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.camera_camera-camera2-pipe", - "androidx.camera_camera-core", - "androidx.concurrent_concurrent-futures-ktx", - "androidx.core_core", - "androidx.lifecycle_lifecycle-livedata-ktx", - "dagger2", - "kotlin-stdlib", - "kotlinx_atomicfu", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.camera_camera-camera2-pipe-integration", + aars: ["camera-camera2-pipe-integration-1.0.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-camera2-pipe-integration-nodeps", "androidx.annotation_annotation", "androidx.camera_camera-camera2-pipe", "androidx.camera_camera-core", @@ -59,6 +35,4 @@ android_library { "kotlinx_atomicfu", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-camera2-pipe/1.0.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/camera/camera-camera2-pipe/1.0.0-alpha01/Android.bp index 76795a959..1a9099be7 100644 --- a/current/androidx/m2repository/androidx/camera/camera-camera2-pipe/1.0.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-camera2-pipe/1.0.0-alpha01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.camera_camera-camera2-pipe-nodeps", - aars: ["camera-camera2-pipe-1.0.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "dagger2", - "kotlin-stdlib", - "kotlinx_atomicfu", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.camera_camera-camera2-pipe", + aars: ["camera-camera2-pipe-1.0.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-camera2-pipe-nodeps", "androidx.annotation_annotation", "dagger2", "kotlin-stdlib", "kotlinx_atomicfu", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp index b947ae4e4..82945c2f6 100644 --- a/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.camera_camera-camera2-nodeps", - aars: ["camera-camera2-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.camera_camera-core", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "auto_value_annotations", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.camera_camera-camera2", + aars: ["camera-camera2-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-camera2-nodeps", "androidx.annotation_annotation", "androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", @@ -51,6 +31,4 @@ android_library { "auto_value_annotations", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-core/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-core/1.4.0-alpha05/Android.bp index 0db0693b3..af8b6bc87 100644 --- a/current/androidx/m2repository/androidx/camera/camera-core/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-core/1.4.0-alpha05/Android.bp @@ -15,41 +15,15 @@ package { } android_library_import { - name: "androidx.camera_camera-core-nodeps", - aars: ["camera-core-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.concurrent_concurrent-futures", - "androidx.concurrent_concurrent-futures-ktx", - "androidx.core_core", - "androidx.exifinterface_exifinterface", - "androidx.lifecycle_lifecycle-common", - "androidx.lifecycle_lifecycle-livedata", - "auto_value_annotations", - "guava-listenablefuture-prebuilt-jar", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.camera_camera-core", + aars: ["camera-core-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-core-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.concurrent_concurrent-futures", @@ -63,6 +37,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-extensions/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-extensions/1.4.0-alpha05/Android.bp index 11d0db4c5..a7a433801 100644 --- a/current/androidx/m2repository/androidx/camera/camera-extensions/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-extensions/1.4.0-alpha05/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.camera_camera-extensions-nodeps", - aars: ["camera-extensions-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.camera_camera-core", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "auto_value_annotations", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.camera_camera-extensions", + aars: ["camera-extensions-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-extensions-nodeps", "androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", "androidx.core_core", "auto_value_annotations", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-lifecycle/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-lifecycle/1.4.0-alpha05/Android.bp index 931563982..34b82dd8b 100644 --- a/current/androidx/m2repository/androidx/camera/camera-lifecycle/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-lifecycle/1.4.0-alpha05/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.camera_camera-lifecycle-nodeps", - aars: ["camera-lifecycle-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.camera_camera-core", - "androidx.concurrent_concurrent-futures", - "androidx.concurrent_concurrent-futures-ktx", - "androidx.core_core", - "androidx.lifecycle_lifecycle-common", - "auto_value_annotations", - "guava-listenablefuture-prebuilt-jar", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.camera_camera-lifecycle", + aars: ["camera-lifecycle-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-lifecycle-nodeps", "androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", "androidx.concurrent_concurrent-futures-ktx", @@ -55,6 +33,4 @@ android_library { "guava-listenablefuture-prebuilt-jar", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-video/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-video/1.4.0-alpha05/Android.bp index 8eb3a7e57..51e69fcd6 100644 --- a/current/androidx/m2repository/androidx/camera/camera-video/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-video/1.4.0-alpha05/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.camera_camera-video-nodeps", - aars: ["camera-video-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.camera_camera-core", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "auto_value_annotations", - ], -} - -android_library { name: "androidx.camera_camera-video", + aars: ["camera-video-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-video-nodeps", "androidx.annotation_annotation", "androidx.camera_camera-core", "androidx.concurrent_concurrent-futures", "androidx.core_core", "auto_value_annotations", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/Android.bp index cf45bf907..3c3ac4549 100644 --- a/current/androidx/m2repository/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/Android.bp @@ -15,40 +15,15 @@ package { } android_library_import { - name: "androidx.camera_camera-viewfinder-core-nodeps", - aars: ["camera-viewfinder-core-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.appcompat_appcompat", - "androidx.concurrent_concurrent-futures", - "androidx.concurrent_concurrent-futures-ktx", - "androidx.core_core", - "androidx.test.espresso.idling-resource", - "auto_value_annotations", - "guava-listenablefuture-prebuilt-jar", - "kotlinx_coroutines", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.camera_camera-viewfinder-core", + aars: ["camera-viewfinder-core-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-viewfinder-core-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.appcompat_appcompat", @@ -61,6 +36,4 @@ android_library { "kotlinx_coroutines", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/camera/camera-viewfinder/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-viewfinder/1.4.0-alpha05/Android.bp index 19a3413cb..08f8c8a0f 100644 --- a/current/androidx/m2repository/androidx/camera/camera-viewfinder/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/camera/camera-viewfinder/1.4.0-alpha05/Android.bp @@ -15,41 +15,15 @@ package { } android_library_import { - name: "androidx.camera_camera-viewfinder-nodeps", - aars: ["camera-viewfinder-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.appcompat_appcompat", - "androidx.camera_camera-viewfinder-core", - "androidx.concurrent_concurrent-futures", - "androidx.concurrent_concurrent-futures-ktx", - "androidx.core_core", - "androidx.test.espresso.idling-resource", - "auto_value_annotations", - "guava-listenablefuture-prebuilt-jar", - "kotlinx_coroutines", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.camera_camera-viewfinder", + aars: ["camera-viewfinder-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.camera_camera-viewfinder-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.appcompat_appcompat", @@ -63,6 +37,4 @@ android_library { "kotlinx_coroutines", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/car/app/app-automotive/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/car/app/app-automotive/1.4.0-alpha01/Android.bp index 4f970b3c0..d116bc946 100644 --- a/current/androidx/m2repository/androidx/car/app/app-automotive/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/car/app/app-automotive/1.4.0-alpha01/Android.bp @@ -15,40 +15,15 @@ package { } android_library_import { - name: "androidx.car.app_app-automotive-nodeps", - aars: ["app-automotive-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "29", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.car.app_app", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "androidx.fragment_fragment", - "androidx.lifecycle_lifecycle-common-java8", - "auto_value_annotations", - "guava", - "guava-listenablefuture-prebuilt-jar", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.car.app_app-automotive", + aars: ["app-automotive-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "29", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.car.app_app-automotive-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.car.app_app", @@ -61,6 +36,4 @@ android_library { "guava-listenablefuture-prebuilt-jar", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/car/app/app-testing/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/car/app/app-testing/1.4.0-alpha01/Android.bp index edf004fd3..75f0b9eb3 100644 --- a/current/androidx/m2repository/androidx/car/app/app-testing/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/car/app/app-testing/1.4.0-alpha01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.car.app_app-testing-nodeps", - aars: ["app-testing-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "Robolectric_all-target_upstream", - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.car.app_app", - "androidx.lifecycle_lifecycle-common-java8", - "androidx.lifecycle_lifecycle-runtime", - ], -} - -android_library { name: "androidx.car.app_app-testing", + aars: ["app-testing-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.car.app_app-testing-nodeps", "Robolectric_all-target_upstream", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", @@ -51,6 +31,4 @@ android_library { "androidx.lifecycle_lifecycle-common-java8", "androidx.lifecycle_lifecycle-runtime", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/car/app/app/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/car/app/app/1.4.0-alpha01/Android.bp index c8ee044a7..09b2b91eb 100644 --- a/current/androidx/m2repository/androidx/car/app/app/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/car/app/app/1.4.0-alpha01/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.car.app_app-nodeps", - aars: ["app-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity", - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.core_core", - "androidx.lifecycle_lifecycle-common-java8", - "androidx.lifecycle_lifecycle-viewmodel", - "guava", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.car.app_app", + aars: ["app-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.car.app_app-nodeps", "androidx.activity_activity", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", @@ -55,6 +33,4 @@ android_library { "guava", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/cardview/cardview/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/cardview/cardview/1.1.0-alpha01/Android.bp index b9ea87ef5..5937cada4 100644 --- a/current/androidx/m2repository/androidx/cardview/cardview/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/cardview/cardview/1.1.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.cardview_cardview-nodeps", - aars: ["cardview-1.1.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - ], -} - -android_library { name: "androidx.cardview_cardview", + aars: ["cardview-1.1.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.cardview_cardview-nodeps", "androidx.annotation_annotation", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/collection/collection-jvm/1.4.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/collection/collection-jvm/1.4.0-alpha02/Android.bp index ba515e26a..8ba93c95d 100644 --- a/current/androidx/m2repository/androidx/collection/collection-jvm/1.4.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/collection/collection-jvm/1.4.0-alpha02/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.collection_collection-nodeps", - jars: ["collection-jvm-1.4.0-alpha02.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.collection_collection", + jars: ["collection-jvm-1.4.0-alpha02.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,10 +24,7 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.collection_collection-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/collection/collection-ktx/1.4.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/collection/collection-ktx/1.4.0-alpha02/Android.bp index bd6a395b3..ee1fdf889 100644 --- a/current/androidx/m2repository/androidx/collection/collection-ktx/1.4.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/collection/collection-ktx/1.4.0-alpha02/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.collection_collection-ktx-nodeps", - jars: ["collection-ktx-1.4.0-alpha02.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.collection_collection-ktx", + jars: ["collection-ktx-1.4.0-alpha02.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,9 +24,6 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.collection_collection-ktx-nodeps", "androidx.collection_collection", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/animation/animation-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/animation/animation-android/1.7.0-alpha05/Android.bp index bb40ff74f..a73f095c9 100644 --- a/current/androidx/m2repository/androidx/compose/animation/animation-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/animation/animation-android/1.7.0-alpha05/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.compose.animation_animation-nodeps", - aars: ["animation-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.compose.animation_animation-core", - "androidx.compose.foundation_foundation-layout", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-geometry", - "androidx.compose.ui_ui-util", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.animation_animation", + aars: ["animation-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.animation_animation-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -59,6 +35,4 @@ android_library { "androidx.compose.ui_ui-util", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/animation/animation-core-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/animation/animation-core-android/1.7.0-alpha05/Android.bp index bc91c5e78..2c88f8469 100644 --- a/current/androidx/m2repository/androidx/compose/animation/animation-core-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/animation/animation-core-android/1.7.0-alpha05/Android.bp @@ -15,38 +15,15 @@ package { } android_library_import { - name: "androidx.compose.animation_animation-core-nodeps", - aars: ["animation-core-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-graphics", - "androidx.compose.ui_ui-unit", - "androidx.compose.ui_ui-util", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.compose.animation_animation-core", + aars: ["animation-core-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.animation_animation-core-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.compose.runtime_runtime", @@ -57,6 +34,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/animation/animation-graphics-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/animation/animation-graphics-android/1.7.0-alpha05/Android.bp index 25df80ca0..2d5c07036 100644 --- a/current/androidx/m2repository/androidx/compose/animation/animation-graphics-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/animation/animation-graphics-android/1.7.0-alpha05/Android.bp @@ -15,40 +15,15 @@ package { } android_library_import { - name: "androidx.compose.animation_animation-graphics-nodeps", - aars: ["animation-graphics-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.compose.animation_animation", - "androidx.compose.foundation_foundation-layout", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-geometry", - "androidx.compose.ui_ui-util", - "androidx.core_core-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.animation_animation-graphics", + aars: ["animation-graphics-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.animation_animation-graphics-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -61,6 +36,4 @@ android_library { "androidx.core_core-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/compiler/compiler-hosted/1.5.11/Android.bp b/current/androidx/m2repository/androidx/compose/compiler/compiler-hosted/1.5.11/Android.bp index a2369ab41..52fc203f6 100644 --- a/current/androidx/m2repository/androidx/compose/compiler/compiler-hosted/1.5.11/Android.bp +++ b/current/androidx/m2repository/androidx/compose/compiler/compiler-hosted/1.5.11/Android.bp @@ -15,16 +15,8 @@ package { } java_import_host { - name: "androidx.compose.compiler_compiler-hosted-nodeps", - jars: ["compiler-hosted-1.5.11.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.compose.compiler_compiler-hosted", + jars: ["compiler-hosted-1.5.11.jar"], static_libs: [ - "androidx.compose.compiler_compiler-hosted-nodeps", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/compiler/compiler/1.5.11/Android.bp b/current/androidx/m2repository/androidx/compose/compiler/compiler/1.5.11/Android.bp index ac6580784..7ba77ace7 100644 --- a/current/androidx/m2repository/androidx/compose/compiler/compiler/1.5.11/Android.bp +++ b/current/androidx/m2repository/androidx/compose/compiler/compiler/1.5.11/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.compose.compiler_compiler-nodeps", - jars: ["compiler-1.5.11.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.compose.compiler_compiler", + jars: ["compiler-1.5.11.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,8 +24,5 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.compose.compiler_compiler-nodeps", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/foundation/foundation-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/foundation/foundation-android/1.7.0-alpha05/Android.bp index 75151f6fc..505f581de 100644 --- a/current/androidx/m2repository/androidx/compose/foundation/foundation-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/foundation/foundation-android/1.7.0-alpha05/Android.bp @@ -15,41 +15,15 @@ package { } android_library_import { - name: "androidx.compose.foundation_foundation-nodeps", - aars: ["foundation-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.compose.animation_animation", - "androidx.compose.foundation_foundation-layout", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-text", - "androidx.compose.ui_ui-util", - "androidx.core_core", - "androidx.emoji2_emoji2", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.foundation_foundation", + aars: ["foundation-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.foundation_foundation-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -63,6 +37,4 @@ android_library { "androidx.emoji2_emoji2", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/foundation/foundation-layout-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/foundation/foundation-layout-android/1.7.0-alpha05/Android.bp index 6e91de3cd..f3793e9d5 100644 --- a/current/androidx/m2repository/androidx/compose/foundation/foundation-layout-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/foundation/foundation-layout-android/1.7.0-alpha05/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.compose.foundation_foundation-layout-nodeps", - aars: ["foundation-layout-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.compose.animation_animation-core", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-unit", - "androidx.compose.ui_ui-util", - "androidx.core_core", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.foundation_foundation-layout", + aars: ["foundation-layout-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.foundation_foundation-layout-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -59,6 +35,4 @@ android_library { "androidx.core_core", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/material/material-android/1.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/compose/material/material-android/1.7.0-alpha01/Android.bp index 4e97f98bf..3de9c02da 100644 --- a/current/androidx/m2repository/androidx/compose/material/material-android/1.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/compose/material/material-android/1.7.0-alpha01/Android.bp @@ -15,44 +15,15 @@ package { } android_library_import { - name: "androidx.compose.material_material-nodeps", - aars: ["material-android-1.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.animation_animation", - "androidx.compose.animation_animation-core", - "androidx.compose.foundation_foundation", - "androidx.compose.foundation_foundation-layout", - "androidx.compose.material_material-icons-core", - "androidx.compose.material_material-ripple", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-text", - "androidx.compose.ui_ui-util", - "androidx.lifecycle_lifecycle-runtime", - "androidx.lifecycle_lifecycle-viewmodel", - "androidx.savedstate_savedstate", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.material_material", + aars: ["material-android-1.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.material_material-nodeps", "androidx.annotation_annotation", "androidx.compose.animation_animation", "androidx.compose.animation_animation-core", @@ -69,6 +40,4 @@ android_library { "androidx.savedstate_savedstate", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/material/material-icons-core-android/1.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/compose/material/material-icons-core-android/1.7.0-alpha01/Android.bp index 06263fdc4..1b661d3a1 100644 --- a/current/androidx/m2repository/androidx/compose/material/material-icons-core-android/1.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/compose/material/material-icons-core-android/1.7.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.compose.material_material-icons-core-nodeps", - aars: ["material-icons-core-android-1.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.compose.ui_ui", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.material_material-icons-core", + aars: ["material-icons-core-android-1.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.material_material-icons-core-nodeps", "androidx.compose.ui_ui", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/material/material-icons-extended-android/1.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/compose/material/material-icons-extended-android/1.7.0-alpha01/Android.bp index e36b173ae..e64ad34a1 100644 --- a/current/androidx/m2repository/androidx/compose/material/material-icons-extended-android/1.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/compose/material/material-icons-extended-android/1.7.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.compose.material_material-icons-extended-nodeps", - aars: ["material-icons-extended-android-1.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.compose.material_material-icons-core", - "androidx.compose.runtime_runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.material_material-icons-extended", + aars: ["material-icons-extended-android-1.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.material_material-icons-extended-nodeps", "androidx.compose.material_material-icons-core", "androidx.compose.runtime_runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/material/material-ripple-android/1.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/compose/material/material-ripple-android/1.7.0-alpha01/Android.bp index cd202fcff..0ff599fec 100644 --- a/current/androidx/m2repository/androidx/compose/material/material-ripple-android/1.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/compose/material/material-ripple-android/1.7.0-alpha01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.compose.material_material-ripple-nodeps", - aars: ["material-ripple-android-1.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.collection_collection", - "androidx.compose.animation_animation", - "androidx.compose.foundation_foundation", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui-util", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.material_material-ripple", + aars: ["material-ripple-android-1.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.material_material-ripple-nodeps", "androidx.collection_collection", "androidx.compose.animation_animation", "androidx.compose.foundation_foundation", @@ -51,6 +31,4 @@ android_library { "androidx.compose.ui_ui-util", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/material3/material3-android/1.3.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/compose/material3/material3-android/1.3.0-alpha03/Android.bp index cbf7c4007..d6b8969de 100644 --- a/current/androidx/m2repository/androidx/compose/material3/material3-android/1.3.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/compose/material3/material3-android/1.3.0-alpha03/Android.bp @@ -15,44 +15,15 @@ package { } android_library_import { - name: "androidx.compose.material3_material3-nodeps", - aars: ["material3-android-1.3.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity-compose", - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.compose.animation_animation-core", - "androidx.compose.foundation_foundation", - "androidx.compose.foundation_foundation-layout", - "androidx.compose.material_material-icons-core", - "androidx.compose.material_material-ripple", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-text", - "androidx.compose.ui_ui-util", - "androidx.lifecycle_lifecycle-common-java8", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.material3_material3", + aars: ["material3-android-1.3.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.material3_material3-nodeps", "androidx.activity_activity-compose", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", @@ -69,6 +40,4 @@ android_library { "androidx.lifecycle_lifecycle-common-java8", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/material3/material3-window-size-class-android/1.3.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/compose/material3/material3-window-size-class-android/1.3.0-alpha03/Android.bp index 2d52a6369..43a5a8b10 100644 --- a/current/androidx/m2repository/androidx/compose/material3/material3-window-size-class-android/1.3.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/compose/material3/material3-window-size-class-android/1.3.0-alpha03/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.compose.material3_material3-window-size-class-nodeps", - aars: ["material3-window-size-class-android-1.3.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation-experimental", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-unit", - "androidx.compose.ui_ui-util", - "androidx.window_window", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.material3_material3-window-size-class", + aars: ["material3-window-size-class-android-1.3.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.material3_material3-window-size-class-nodeps", "androidx.annotation_annotation-experimental", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui", @@ -53,6 +32,4 @@ android_library { "androidx.window_window", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/runtime/runtime-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/runtime/runtime-android/1.7.0-alpha05/Android.bp index 561435ba3..70e5029dc 100644 --- a/current/androidx/m2repository/androidx/compose/runtime/runtime-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/runtime/runtime-android/1.7.0-alpha05/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.compose.runtime_runtime-nodeps", - aars: ["runtime-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "kotlin-stdlib", - "kotlinx_coroutines", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.compose.runtime_runtime", + aars: ["runtime-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.runtime_runtime-nodeps", "androidx.annotation_annotation-experimental", "androidx.collection_collection", "kotlin-stdlib", "kotlinx_coroutines", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/runtime/runtime-livedata/1.4.0-beta01/Android.bp b/current/androidx/m2repository/androidx/compose/runtime/runtime-livedata/1.4.0-beta01/Android.bp index 09858fa9a..4f8fe19de 100644 --- a/current/androidx/m2repository/androidx/compose/runtime/runtime-livedata/1.4.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/compose/runtime/runtime-livedata/1.4.0-beta01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.compose.runtime_runtime-livedata-nodeps", - aars: ["runtime-livedata-1.4.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.lifecycle_lifecycle-livedata", - "androidx.lifecycle_lifecycle-runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.runtime_runtime-livedata", + aars: ["runtime-livedata-1.4.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.runtime_runtime-livedata-nodeps", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui", "androidx.lifecycle_lifecycle-livedata", "androidx.lifecycle_lifecycle-runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/runtime/runtime-saveable-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/runtime/runtime-saveable-android/1.7.0-alpha05/Android.bp index 6c8f174e8..c34a93eeb 100644 --- a/current/androidx/m2repository/androidx/compose/runtime/runtime-saveable-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/runtime/runtime-saveable-android/1.7.0-alpha05/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.compose.runtime_runtime-saveable-nodeps", - aars: ["runtime-saveable-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.runtime_runtime-saveable", + aars: ["runtime-saveable-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.runtime_runtime-saveable-nodeps", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/runtime/runtime-tracing/1.0.0-beta01/Android.bp b/current/androidx/m2repository/androidx/compose/runtime/runtime-tracing/1.0.0-beta01/Android.bp index 710ad3fef..12048d8e2 100644 --- a/current/androidx/m2repository/androidx/compose/runtime/runtime-tracing/1.0.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/compose/runtime/runtime-tracing/1.0.0-beta01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.compose.runtime_runtime-tracing-nodeps", - aars: ["runtime-tracing-1.0.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "androidx.startup_startup-runtime", - "androidx.tracing_tracing-perfetto", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.runtime_runtime-tracing", + aars: ["runtime-tracing-1.0.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.runtime_runtime-tracing-nodeps", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", "androidx.startup_startup-runtime", "androidx.tracing_tracing-perfetto", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-android/1.7.0-alpha05/Android.bp index c6c5f4e3c..ff2e3bd95 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-android/1.7.0-alpha05/Android.bp @@ -15,51 +15,15 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-nodeps", - aars: ["ui-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity-ktx", - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.autofill_autofill", - "androidx.collection_collection", - "androidx.compose.runtime_runtime", - "androidx.compose.runtime_runtime-saveable", - "androidx.compose.ui_ui-geometry", - "androidx.compose.ui_ui-graphics", - "androidx.compose.ui_ui-text", - "androidx.compose.ui_ui-unit", - "androidx.compose.ui_ui-util", - "androidx.core_core", - "androidx.customview_customview-poolingcontainer", - "androidx.emoji2_emoji2", - "androidx.lifecycle_lifecycle-runtime-compose", - "androidx.lifecycle_lifecycle-viewmodel", - "androidx.profileinstaller_profileinstaller", - "androidx.savedstate_savedstate-ktx", - "kotlin-stdlib", - "kotlinx_coroutines", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.compose.ui_ui", + aars: ["ui-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-nodeps", "androidx.activity_activity-ktx", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", @@ -83,6 +47,4 @@ android_library { "kotlinx_coroutines", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-geometry-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-geometry-android/1.7.0-alpha05/Android.bp index 51b754df6..2ad3f6354 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-geometry-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-geometry-android/1.7.0-alpha05/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-geometry-nodeps", - aars: ["ui-geometry-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui-util", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.ui_ui-geometry", + aars: ["ui-geometry-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-geometry-nodeps", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui-util", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-graphics-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-graphics-android/1.7.0-alpha05/Android.bp index 147ea09a6..97bb4d8cd 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-graphics-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-graphics-android/1.7.0-alpha05/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-graphics-nodeps", - aars: ["ui-graphics-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui-unit", - "androidx.compose.ui_ui-util", - "androidx.graphics_graphics-path", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.ui_ui-graphics", + aars: ["ui-graphics-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-graphics-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -55,6 +33,4 @@ android_library { "androidx.graphics_graphics-path", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-test-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-test-android/1.7.0-alpha05/Android.bp index 2a6b74037..60b29ec3c 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-test-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-test-android/1.7.0-alpha05/Android.bp @@ -15,44 +15,15 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-test-nodeps", - aars: ["ui-test-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity-compose", - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-graphics", - "androidx.compose.ui_ui-text", - "androidx.compose.ui_ui-unit", - "androidx.compose.ui_ui-util", - "androidx.core_core-ktx", - "androidx.test.espresso.core", - "androidx.test.espresso.idling-resource", - "androidx.test.monitor", - "kotlin-stdlib", - "kotlinx_coroutines", - "kotlinx_coroutines_test", - ], -} - -android_library { name: "androidx.compose.ui_ui-test", + aars: ["ui-test-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-test-nodeps", "androidx.activity_activity-compose", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", @@ -69,6 +40,4 @@ android_library { "kotlinx_coroutines", "kotlinx_coroutines_test", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-test-junit4-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-test-junit4-android/1.7.0-alpha05/Android.bp index 01b07bcb8..fc5077b1b 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-test-junit4-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-test-junit4-android/1.7.0-alpha05/Android.bp @@ -15,43 +15,15 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-test-junit4-nodeps", - aars: ["ui-test-junit4-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity", - "androidx.activity_activity-compose", - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime-saveable", - "androidx.compose.ui_ui-test", - "androidx.lifecycle_lifecycle-common", - "androidx.lifecycle_lifecycle-runtime", - "androidx.test.core", - "androidx.test.ext.junit", - "androidx.test.monitor", - "junit", - "kotlin-stdlib", - "kotlinx_coroutines", - "kotlinx_coroutines_test", - ], -} - -android_library { name: "androidx.compose.ui_ui-test-junit4", + aars: ["ui-test-junit4-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-test-junit4-nodeps", "androidx.activity_activity", "androidx.activity_activity-compose", "androidx.annotation_annotation", @@ -67,6 +39,4 @@ android_library { "kotlinx_coroutines", "kotlinx_coroutines_test", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-test-manifest/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-test-manifest/1.7.0-alpha05/Android.bp index 6378a95da..b05324adb 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-test-manifest/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-test-manifest/1.7.0-alpha05/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-test-manifest-nodeps", - aars: ["ui-test-manifest-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity", - ], -} - -android_library { name: "androidx.compose.ui_ui-test-manifest", + aars: ["ui-test-manifest-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-test-manifest-nodeps", "androidx.activity_activity", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-text-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-text-android/1.7.0-alpha05/Android.bp index 95a006090..78eeb258a 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-text-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-text-android/1.7.0-alpha05/Android.bp @@ -15,41 +15,15 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-text-nodeps", - aars: ["ui-text-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.compose.runtime_runtime", - "androidx.compose.runtime_runtime-saveable", - "androidx.compose.ui_ui-graphics", - "androidx.compose.ui_ui-unit", - "androidx.compose.ui_ui-util", - "androidx.core_core", - "androidx.emoji2_emoji2", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.compose.ui_ui-text", + aars: ["ui-text-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-text-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -63,6 +37,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-android/1.7.0-alpha05/Android.bp index dcdbb5ba9..f8d4acd5c 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-android/1.7.0-alpha05/Android.bp @@ -15,40 +15,15 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-tooling-nodeps", - aars: ["ui-tooling-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity-compose", - "androidx.annotation_annotation", - "androidx.compose.animation_animation", - "androidx.compose.material_material", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-tooling-data", - "androidx.compose.ui_ui-tooling-preview", - "androidx.lifecycle_lifecycle-common", - "androidx.savedstate_savedstate-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.ui_ui-tooling", + aars: ["ui-tooling-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-tooling-nodeps", "androidx.activity_activity-compose", "androidx.annotation_annotation", "androidx.compose.animation_animation", @@ -61,6 +36,4 @@ android_library { "androidx.savedstate_savedstate-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-data-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-data-android/1.7.0-alpha05/Android.bp index f2e644940..b1134c46a 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-data-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-data-android/1.7.0-alpha05/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-tooling-data-nodeps", - aars: ["ui-tooling-data-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.ui_ui-tooling-data", + aars: ["ui-tooling-data-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-tooling-data-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-preview-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-preview-android/1.7.0-alpha05/Android.bp index 9c78b57c2..5d49531c3 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-preview-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-preview-android/1.7.0-alpha05/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-tooling-preview-nodeps", - aars: ["ui-tooling-preview-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.ui_ui-tooling-preview", + aars: ["ui-tooling-preview-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-tooling-preview-nodeps", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-unit-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-unit-android/1.7.0-alpha05/Android.bp index 2f7ab7c8f..c37acc453 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-unit-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-unit-android/1.7.0-alpha05/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-unit-nodeps", - aars: ["ui-unit-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.collection_collection-ktx", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui-geometry", - "androidx.compose.ui_ui-util", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.ui_ui-unit", + aars: ["ui-unit-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-unit-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -55,6 +33,4 @@ android_library { "androidx.compose.ui_ui-util", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-util-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-util-android/1.7.0-alpha05/Android.bp index 98d650d90..095e27784 100644 --- a/current/androidx/m2repository/androidx/compose/ui/ui-util-android/1.7.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/compose/ui/ui-util-android/1.7.0-alpha05/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.compose.ui_ui-util-nodeps", - aars: ["ui-util-android-1.7.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation-experimental", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.compose.ui_ui-util", + aars: ["ui-util-android-1.7.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.compose.ui_ui-util-nodeps", "androidx.annotation_annotation-experimental", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/concurrent/concurrent-futures-ktx/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/concurrent/concurrent-futures-ktx/1.2.0-alpha01/Android.bp index c4da71d24..cc2055909 100644 --- a/current/androidx/m2repository/androidx/concurrent/concurrent-futures-ktx/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/concurrent/concurrent-futures-ktx/1.2.0-alpha01/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.concurrent_concurrent-futures-ktx-nodeps", - jars: ["concurrent-futures-ktx-1.2.0-alpha01.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.concurrent_concurrent-futures-ktx", + jars: ["concurrent-futures-ktx-1.2.0-alpha01.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,11 +24,8 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.concurrent_concurrent-futures-ktx-nodeps", "androidx.concurrent_concurrent-futures", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/concurrent/concurrent-futures/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/concurrent/concurrent-futures/1.2.0-alpha01/Android.bp index 37075fc43..196936abe 100644 --- a/current/androidx/m2repository/androidx/concurrent/concurrent-futures/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/concurrent/concurrent-futures/1.2.0-alpha01/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.concurrent_concurrent-futures-nodeps", - jars: ["concurrent-futures-1.2.0-alpha01.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.concurrent_concurrent-futures", + jars: ["concurrent-futures-1.2.0-alpha01.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,10 +24,7 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.concurrent_concurrent-futures-nodeps", "androidx.annotation_annotation", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-compose-android/1.1.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-compose-android/1.1.0-alpha13/Android.bp index 538421855..d0596fac6 100644 --- a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-compose-android/1.1.0-alpha13/Android.bp +++ b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-compose-android/1.1.0-alpha13/Android.bp @@ -15,38 +15,15 @@ package { } android_library_import { - name: "androidx.constraintlayout_constraintlayout-compose-nodeps", - aars: ["constraintlayout-compose-android-1.1.0-alpha13.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.compose.foundation_foundation", - "androidx.compose.foundation_foundation-layout", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-unit", - "androidx.compose.ui_ui-util", - "androidx.constraintlayout_constraintlayout-core", - "androidx.core_core-ktx", - ], -} - -android_library { name: "androidx.constraintlayout_constraintlayout-compose", + aars: ["constraintlayout-compose-android-1.1.0-alpha13.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.constraintlayout_constraintlayout-compose-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.compose.foundation_foundation", @@ -57,6 +34,4 @@ android_library { "androidx.constraintlayout_constraintlayout-core", "androidx.core_core-ktx", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-core/1.1.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-core/1.1.0-alpha13/Android.bp index cfbcb401b..1fb483b71 100644 --- a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-core/1.1.0-alpha13/Android.bp +++ b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-core/1.1.0-alpha13/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.constraintlayout_constraintlayout-core-nodeps", - jars: ["constraintlayout-core-1.1.0-alpha13.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.constraintlayout_constraintlayout-core", + jars: ["constraintlayout-core-1.1.0-alpha13.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,9 +24,6 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.constraintlayout_constraintlayout-core-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout/2.2.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout/2.2.0-alpha13/Android.bp index 25a0ce7c7..0975e168e 100644 --- a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout/2.2.0-alpha13/Android.bp +++ b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout/2.2.0-alpha13/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx-constraintlayout_constraintlayout-nodeps", - aars: ["constraintlayout-2.2.0-alpha13.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.appcompat_appcompat", - "androidx.constraintlayout_constraintlayout-core", - "androidx.core_core", - "androidx.profileinstaller_profileinstaller", - ], -} - -android_library { name: "androidx-constraintlayout_constraintlayout", + aars: ["constraintlayout-2.2.0-alpha13.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx-constraintlayout_constraintlayout-nodeps", "androidx.appcompat_appcompat", "androidx.constraintlayout_constraintlayout-core", "androidx.core_core", "androidx.profileinstaller_profileinstaller", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/1.3.0-alpha01/Android.bp index ada595877..7c1d27406 100644 --- a/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/1.3.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.coordinatorlayout_coordinatorlayout-nodeps", - aars: ["coordinatorlayout-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.customview_customview", - ], -} - -android_library { name: "androidx.coordinatorlayout_coordinatorlayout", + aars: ["coordinatorlayout-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.coordinatorlayout_coordinatorlayout-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.customview_customview", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/core/core-animation-testing/1.0.0-rc01/Android.bp b/current/androidx/m2repository/androidx/core/core-animation-testing/1.0.0-rc01/Android.bp index f3e4e9208..22cac4625 100644 --- a/current/androidx/m2repository/androidx/core/core-animation-testing/1.0.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/core/core-animation-testing/1.0.0-rc01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.core_core-animation-testing-nodeps", - aars: ["core-animation-testing-1.0.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.core_core-animation", - "junit", - ], -} - -android_library { name: "androidx.core_core-animation-testing", + aars: ["core-animation-testing-1.0.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.core_core-animation-testing-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.core_core-animation", "junit", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/core/core-animation/1.0.0-rc01/Android.bp b/current/androidx/m2repository/androidx/core/core-animation/1.0.0-rc01/Android.bp index 26b1b16f8..4e2d87e15 100644 --- a/current/androidx/m2repository/androidx/core/core-animation/1.0.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/core/core-animation/1.0.0-rc01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.core_core-animation-nodeps", - aars: ["core-animation-1.0.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.tracing_tracing", - ], -} - -android_library { name: "androidx.core_core-animation", + aars: ["core-animation-1.0.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.core_core-animation-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.tracing_tracing", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/core/core-ktx/1.14.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/core/core-ktx/1.14.0-alpha01/Android.bp index a704120f1..3036d428f 100644 --- a/current/androidx/m2repository/androidx/core/core-ktx/1.14.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/core/core-ktx/1.14.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.core_core-ktx-nodeps", - aars: ["core-ktx-1.14.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.core_core-ktx", + aars: ["core-ktx-1.14.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.core_core-ktx-nodeps", "androidx.annotation_annotation", "androidx.core_core", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/core/core-remoteviews/1.1.0-beta02/Android.bp b/current/androidx/m2repository/androidx/core/core-remoteviews/1.1.0-beta02/Android.bp index 7aa869c2e..e9ab75277 100644 --- a/current/androidx/m2repository/androidx/core/core-remoteviews/1.1.0-beta02/Android.bp +++ b/current/androidx/m2repository/androidx/core/core-remoteviews/1.1.0-beta02/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.core_core-remoteviews-nodeps", - aars: ["core-remoteviews-1.1.0-beta02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.core_core-remoteviews", + aars: ["core-remoteviews-1.1.0-beta02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.core_core-remoteviews-nodeps", "androidx.annotation_annotation", "androidx.core_core", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/core/core/1.14.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/core/core/1.14.0-alpha01/Android.bp index 1998ab2f0..003ad288c 100644 --- a/current/androidx/m2repository/androidx/core/core/1.14.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/core/core/1.14.0-alpha01/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.core_core-nodeps", - aars: ["core-1.14.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.interpolator_interpolator", - "androidx.lifecycle_lifecycle-runtime", - "androidx.versionedparcelable_versionedparcelable", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.core_core", + aars: ["core-1.14.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.core_core-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -55,6 +33,4 @@ android_library { "androidx.versionedparcelable_versionedparcelable", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/credentials/credentials/1.3.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/credentials/credentials/1.3.0-alpha03/Android.bp index c7331f1ec..019a9d6ed 100644 --- a/current/androidx/m2repository/androidx/credentials/credentials/1.3.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/credentials/credentials/1.3.0-alpha03/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.credentials_credentials-nodeps", - aars: ["credentials-1.3.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.credentials_credentials", + aars: ["credentials-1.3.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.credentials_credentials-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/cursoradapter/cursoradapter/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/cursoradapter/cursoradapter/1.1.0-alpha01/Android.bp index fde5666c2..3a5fcaeb9 100644 --- a/current/androidx/m2repository/androidx/cursoradapter/cursoradapter/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/cursoradapter/cursoradapter/1.1.0-alpha01/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.cursoradapter_cursoradapter-nodeps", - aars: ["cursoradapter-1.1.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - ], -} - -android_library { name: "androidx.cursoradapter_cursoradapter", + aars: ["cursoradapter-1.1.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.cursoradapter_cursoradapter-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/customview/customview-poolingcontainer/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/customview/customview-poolingcontainer/1.1.0-alpha01/Android.bp index f5c5e4258..59d1e51bb 100644 --- a/current/androidx/m2repository/androidx/customview/customview-poolingcontainer/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/customview/customview-poolingcontainer/1.1.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.customview_customview-poolingcontainer-nodeps", - aars: ["customview-poolingcontainer-1.1.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.core_core-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.customview_customview-poolingcontainer", + aars: ["customview-poolingcontainer-1.1.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.customview_customview-poolingcontainer-nodeps", "androidx.core_core-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/customview/customview/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/customview/customview/1.2.0-alpha03/Android.bp index 20f2c177e..6ea2936e2 100644 --- a/current/androidx/m2repository/androidx/customview/customview/1.2.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/customview/customview/1.2.0-alpha03/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.customview_customview-nodeps", - aars: ["customview-1.2.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - ], -} - -android_library { name: "androidx.customview_customview", + aars: ["customview-1.2.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.customview_customview-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/datastore/datastore-android/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-android/1.1.0-rc01/Android.bp index a8ab33d8b..164499e17 100644 --- a/current/androidx/m2repository/androidx/datastore/datastore-android/1.1.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/datastore/datastore-android/1.1.0-rc01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.datastore_datastore-nodeps", - aars: ["datastore-android-1.1.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.datastore_datastore-core", - "androidx.datastore_datastore-core-okio", - "kotlin-stdlib", - "kotlinx_coroutines", - "okio-lib", - ], -} - -android_library { name: "androidx.datastore_datastore", + aars: ["datastore-android-1.1.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.datastore_datastore-nodeps", "androidx.annotation_annotation", "androidx.datastore_datastore-core", "androidx.datastore_datastore-core-okio", @@ -51,6 +31,4 @@ android_library { "kotlinx_coroutines", "okio-lib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/datastore/datastore-core-android/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-core-android/1.1.0-rc01/Android.bp index 4a3ec4cc9..465d68e18 100644 --- a/current/androidx/m2repository/androidx/datastore/datastore-core-android/1.1.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/datastore/datastore-core-android/1.1.0-rc01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.datastore_datastore-core-nodeps", - aars: ["datastore-core-android-1.1.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "kotlin-parcelize-runtime", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.datastore_datastore-core", + aars: ["datastore-core-android-1.1.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.datastore_datastore-core-nodeps", "androidx.annotation_annotation", "kotlin-parcelize-runtime", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/datastore/datastore-core-okio-jvm/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-core-okio-jvm/1.1.0-rc01/Android.bp index e632104f0..ec70613e3 100644 --- a/current/androidx/m2repository/androidx/datastore/datastore-core-okio-jvm/1.1.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/datastore/datastore-core-okio-jvm/1.1.0-rc01/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.datastore_datastore-core-okio-nodeps", - jars: ["datastore-core-okio-jvm-1.1.0-rc01.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.datastore_datastore-core-okio", + jars: ["datastore-core-okio-jvm-1.1.0-rc01.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,12 +24,9 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.datastore_datastore-core-okio-nodeps", "androidx.datastore_datastore-core", "kotlin-stdlib", "kotlinx_coroutines", "okio-lib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/datastore/datastore-preferences-android/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-preferences-android/1.1.0-rc01/Android.bp index 1e76a71e2..a06824ec9 100644 --- a/current/androidx/m2repository/androidx/datastore/datastore-preferences-android/1.1.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/datastore/datastore-preferences-android/1.1.0-rc01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.datastore_datastore-preferences-nodeps", - aars: ["datastore-preferences-android-1.1.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.datastore_datastore", - "androidx.datastore_datastore-preferences-core", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.datastore_datastore-preferences", + aars: ["datastore-preferences-android-1.1.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.datastore_datastore-preferences-nodeps", "androidx.datastore_datastore", "androidx.datastore_datastore-preferences-core", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/datastore/datastore-preferences-core-jvm/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-preferences-core-jvm/1.1.0-rc01/Android.bp index d51dc64db..50e40288f 100644 --- a/current/androidx/m2repository/androidx/datastore/datastore-preferences-core-jvm/1.1.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/datastore/datastore-preferences-core-jvm/1.1.0-rc01/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.datastore_datastore-preferences-core-nodeps", - jars: ["datastore-preferences-core-jvm-1.1.0-rc01.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.datastore_datastore-preferences-core", + jars: ["datastore-preferences-core-jvm-1.1.0-rc01.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,12 +24,9 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.datastore_datastore-preferences-core-nodeps", "androidx.datastore_datastore-core", "androidx.datastore_datastore-core-okio", "kotlin-stdlib", "okio-lib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/datastore/datastore-preferences-rxjava2/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-preferences-rxjava2/1.1.0-rc01/Android.bp index 8f333d144..595e1979f 100644 --- a/current/androidx/m2repository/androidx/datastore/datastore-preferences-rxjava2/1.1.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/datastore/datastore-preferences-rxjava2/1.1.0-rc01/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.datastore_datastore-preferences-rxjava2-nodeps", - aars: ["datastore-preferences-rxjava2-1.1.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.datastore_datastore", - "androidx.datastore_datastore-preferences", - "androidx.datastore_datastore-rxjava2", - "kotlin-stdlib", - "kotlinx_coroutines", - "kotlinx_coroutines_rx2", - "rxjava", - ], -} - -android_library { name: "androidx.datastore_datastore-preferences-rxjava2", + aars: ["datastore-preferences-rxjava2-1.1.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.datastore_datastore-preferences-rxjava2-nodeps", "androidx.annotation_annotation", "androidx.datastore_datastore", "androidx.datastore_datastore-preferences", @@ -55,6 +33,4 @@ android_library { "kotlinx_coroutines_rx2", "rxjava", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/datastore/datastore-rxjava2/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-rxjava2/1.1.0-rc01/Android.bp index 207c94884..b868f7dc0 100644 --- a/current/androidx/m2repository/androidx/datastore/datastore-rxjava2/1.1.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/datastore/datastore-rxjava2/1.1.0-rc01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.datastore_datastore-rxjava2-nodeps", - aars: ["datastore-rxjava2-1.1.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.datastore_datastore", - "kotlin-stdlib", - "kotlinx_coroutines", - "kotlinx_coroutines_rx2", - "rxjava", - ], -} - -android_library { name: "androidx.datastore_datastore-rxjava2", + aars: ["datastore-rxjava2-1.1.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.datastore_datastore-rxjava2-nodeps", "androidx.annotation_annotation", "androidx.datastore_datastore", "kotlin-stdlib", @@ -51,6 +31,4 @@ android_library { "kotlinx_coroutines_rx2", "rxjava", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/documentfile/documentfile/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/documentfile/documentfile/1.1.0-alpha02/Android.bp index cf1143904..e1e8a6ece 100644 --- a/current/androidx/m2repository/androidx/documentfile/documentfile/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/documentfile/documentfile/1.1.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.documentfile_documentfile-nodeps", - aars: ["documentfile-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - ], -} - -android_library { name: "androidx.documentfile_documentfile", + aars: ["documentfile-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.documentfile_documentfile-nodeps", "androidx.annotation_annotation", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/drawerlayout/drawerlayout/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/drawerlayout/drawerlayout/1.3.0-alpha01/Android.bp index 0d00283a0..14f6bd490 100644 --- a/current/androidx/m2repository/androidx/drawerlayout/drawerlayout/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/drawerlayout/drawerlayout/1.3.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.drawerlayout_drawerlayout-nodeps", - aars: ["drawerlayout-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.customview_customview", - ], -} - -android_library { name: "androidx.drawerlayout_drawerlayout", + aars: ["drawerlayout-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.drawerlayout_drawerlayout-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.customview_customview", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/Android.bp index ca3a188bf..ef6d669f2 100644 --- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.dynamicanimation_dynamicanimation-nodeps", - aars: ["dynamicanimation-1.1.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.collection_collection", - "androidx.core_core", - ], -} - -android_library { name: "androidx.dynamicanimation_dynamicanimation", + aars: ["dynamicanimation-1.1.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.dynamicanimation_dynamicanimation-nodeps", "androidx.collection_collection", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/emoji/emoji-appcompat/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/emoji/emoji-appcompat/1.2.0-alpha03/Android.bp index 767e64fe9..a1eee6e88 100644 --- a/current/androidx/m2repository/androidx/emoji/emoji-appcompat/1.2.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/emoji/emoji-appcompat/1.2.0-alpha03/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.emoji_emoji-appcompat-nodeps", - aars: ["emoji-appcompat-1.2.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.appcompat_appcompat", - "androidx.emoji_emoji", - ], -} - -android_library { name: "androidx.emoji_emoji-appcompat", + aars: ["emoji-appcompat-1.2.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.emoji_emoji-appcompat-nodeps", "androidx.appcompat_appcompat", "androidx.emoji_emoji", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/emoji/emoji-bundled/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/emoji/emoji-bundled/1.2.0-alpha03/Android.bp index ac1383a7e..bc34e45d7 100644 --- a/current/androidx/m2repository/androidx/emoji/emoji-bundled/1.2.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/emoji/emoji-bundled/1.2.0-alpha03/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.emoji_emoji-bundled-nodeps", - aars: ["emoji-bundled-1.2.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.emoji_emoji", - ], -} - -android_library { name: "androidx.emoji_emoji-bundled", + aars: ["emoji-bundled-1.2.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.emoji_emoji-bundled-nodeps", "androidx.emoji_emoji", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/emoji/emoji/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/emoji/emoji/1.2.0-alpha03/Android.bp index 408e3b1f5..08e92c4f1 100644 --- a/current/androidx/m2repository/androidx/emoji/emoji/1.2.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/emoji/emoji/1.2.0-alpha03/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.emoji_emoji-nodeps", - aars: ["emoji-1.2.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.collection_collection", - "androidx.core_core", - ], -} - -android_library { name: "androidx.emoji_emoji", + aars: ["emoji-1.2.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.emoji_emoji-nodeps", "androidx.collection_collection", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/emoji2/emoji2-views-helper/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/emoji2/emoji2-views-helper/1.5.0-alpha01/Android.bp index 44bdaf3a4..6b11995bd 100644 --- a/current/androidx/m2repository/androidx/emoji2/emoji2-views-helper/1.5.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/emoji2/emoji2-views-helper/1.5.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.emoji2_emoji2-views-helper-nodeps", - aars: ["emoji2-views-helper-1.5.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.collection_collection", - "androidx.core_core", - "androidx.emoji2_emoji2", - ], -} - -android_library { name: "androidx.emoji2_emoji2-views-helper", + aars: ["emoji2-views-helper-1.5.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.emoji2_emoji2-views-helper-nodeps", "androidx.collection_collection", "androidx.core_core", "androidx.emoji2_emoji2", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/emoji2/emoji2/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/emoji2/emoji2/1.5.0-alpha01/Android.bp index 5e582e538..6d31e368d 100644 --- a/current/androidx/m2repository/androidx/emoji2/emoji2/1.5.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/emoji2/emoji2/1.5.0-alpha01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.emoji2_emoji2-nodeps", - aars: ["emoji2-1.5.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.lifecycle_lifecycle-process", - "androidx.startup_startup-runtime", - ], -} - -android_library { name: "androidx.emoji2_emoji2", + aars: ["emoji2-1.5.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.emoji2_emoji2-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.lifecycle_lifecycle-process", "androidx.startup_startup-runtime", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/exifinterface/exifinterface/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/exifinterface/exifinterface/1.4.0-alpha01/Android.bp index 724e8a762..3d8894fd4 100644 --- a/current/androidx/m2repository/androidx/exifinterface/exifinterface/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/exifinterface/exifinterface/1.4.0-alpha01/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.exifinterface_exifinterface-nodeps", - aars: ["exifinterface-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - ], -} - -android_library { name: "androidx.exifinterface_exifinterface", + aars: ["exifinterface-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.exifinterface_exifinterface-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/fragment/fragment-ktx/1.8.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/fragment/fragment-ktx/1.8.0-alpha02/Android.bp index f5f431c50..f75fc3caa 100644 --- a/current/androidx/m2repository/androidx/fragment/fragment-ktx/1.8.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/fragment/fragment-ktx/1.8.0-alpha02/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.fragment_fragment-ktx-nodeps", - aars: ["fragment-ktx-1.8.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity-ktx", - "androidx.collection_collection-ktx", - "androidx.core_core-ktx", - "androidx.fragment_fragment", - "androidx.lifecycle_lifecycle-livedata-core-ktx", - "androidx.lifecycle_lifecycle-viewmodel-ktx", - "androidx.savedstate_savedstate-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.fragment_fragment-ktx", + aars: ["fragment-ktx-1.8.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.fragment_fragment-ktx-nodeps", "androidx.activity_activity-ktx", "androidx.collection_collection-ktx", "androidx.core_core-ktx", @@ -55,6 +33,4 @@ android_library { "androidx.savedstate_savedstate-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/fragment/fragment-testing-manifest/1.8.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/fragment/fragment-testing-manifest/1.8.0-alpha02/Android.bp index e7bcd8547..087d5cf0a 100644 --- a/current/androidx/m2repository/androidx/fragment/fragment-testing-manifest/1.8.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/fragment/fragment-testing-manifest/1.8.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.fragment_fragment-testing-manifest-nodeps", - aars: ["fragment-testing-manifest-1.8.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.fragment_fragment-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.fragment_fragment-testing-manifest", + aars: ["fragment-testing-manifest-1.8.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.fragment_fragment-testing-manifest-nodeps", "androidx.fragment_fragment-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/fragment/fragment-testing/1.8.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/fragment/fragment-testing/1.8.0-alpha02/Android.bp index 5197886ca..a6dcf63cb 100644 --- a/current/androidx/m2repository/androidx/fragment/fragment-testing/1.8.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/fragment/fragment-testing/1.8.0-alpha02/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.fragment_fragment-testing-nodeps", - aars: ["fragment-testing-1.8.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.fragment_fragment-ktx", - "androidx.fragment_fragment-testing-manifest", - "androidx.test.core", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.fragment_fragment-testing", + aars: ["fragment-testing-1.8.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.fragment_fragment-testing-nodeps", "androidx.fragment_fragment-ktx", "androidx.fragment_fragment-testing-manifest", "androidx.test.core", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/fragment/fragment/1.8.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/fragment/fragment/1.8.0-alpha02/Android.bp index 36b3ef3a9..22fc86e09 100644 --- a/current/androidx/m2repository/androidx/fragment/fragment/1.8.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/fragment/fragment/1.8.0-alpha02/Android.bp @@ -15,43 +15,15 @@ package { } android_library_import { - name: "androidx.fragment_fragment-nodeps", - aars: ["fragment-1.8.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity", - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.core_core-ktx", - "androidx.lifecycle_lifecycle-livedata-core", - "androidx.lifecycle_lifecycle-runtime", - "androidx.lifecycle_lifecycle-viewmodel", - "androidx.lifecycle_lifecycle-viewmodel-savedstate", - "androidx.loader_loader", - "androidx.profileinstaller_profileinstaller", - "androidx.savedstate_savedstate", - "androidx.viewpager_viewpager", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.fragment_fragment", + aars: ["fragment-1.8.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.fragment_fragment-nodeps", "androidx.activity_activity", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", @@ -67,6 +39,4 @@ android_library { "androidx.viewpager_viewpager", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget-preview/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget-preview/1.0.0-alpha06/Android.bp index ca9bc725d..caa406c39 100644 --- a/current/androidx/m2repository/androidx/glance/glance-appwidget-preview/1.0.0-alpha06/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-appwidget-preview/1.0.0-alpha06/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.glance_glance-appwidget-preview-nodeps", - aars: ["glance-appwidget-preview-1.0.0-alpha06.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.compose.runtime_runtime", - "androidx.core_core", - "androidx.glance_glance", - "androidx.glance_glance-appwidget", - "kotlin-reflect", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.glance_glance-appwidget-preview", + aars: ["glance-appwidget-preview-1.0.0-alpha06.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-appwidget-preview-nodeps", "androidx.compose.runtime_runtime", "androidx.core_core", "androidx.glance_glance", @@ -53,6 +32,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget-samples/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget-samples/1.1.0-beta01/Android.bp index 3506e1e78..8224c026f 100644 --- a/current/androidx/m2repository/androidx/glance/glance-appwidget-samples/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-appwidget-samples/1.1.0-beta01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.glance_glance-appwidget-samples-nodeps", - aars: ["glance-appwidget-samples-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.core_core", - "androidx.glance_glance", - "androidx.glance_glance-appwidget", - "androidx.work_work-runtime", - "androidx.work_work-runtime-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance-appwidget-samples", + aars: ["glance-appwidget-samples-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-appwidget-samples-nodeps", "androidx.core_core", "androidx.glance_glance", "androidx.glance_glance-appwidget", @@ -51,6 +31,4 @@ android_library { "androidx.work_work-runtime-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget-testing-samples/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget-testing-samples/1.1.0-beta01/Android.bp index 4611c70eb..d2aeb733e 100644 --- a/current/androidx/m2repository/androidx/glance/glance-appwidget-testing-samples/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-appwidget-testing-samples/1.1.0-beta01/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.glance_glance-appwidget-testing-samples-nodeps", - aars: ["glance-appwidget-testing-samples-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "23", - static_libs: [ - "androidx.core_core", - "androidx.core_core-ktx", - "androidx.glance_glance", - "androidx.glance_glance-appwidget-testing", - "androidx.glance_glance-testing", - "androidx.test.core", - "junit", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance-appwidget-testing-samples", + aars: ["glance-appwidget-testing-samples-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "23", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-appwidget-testing-samples-nodeps", "androidx.core_core", "androidx.core_core-ktx", "androidx.glance_glance", @@ -55,6 +33,4 @@ android_library { "junit", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget-testing/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget-testing/1.1.0-beta01/Android.bp index 29c7e759a..a5dc57621 100644 --- a/current/androidx/m2repository/androidx/glance/glance-appwidget-testing/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-appwidget-testing/1.1.0-beta01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.glance_glance-appwidget-testing-nodeps", - aars: ["glance-appwidget-testing-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "23", - static_libs: [ - "androidx.glance_glance-appwidget", - "androidx.glance_glance-testing", - "kotlin-stdlib", - "kotlinx_coroutines_test", - ], -} - -android_library { name: "androidx.glance_glance-appwidget-testing", + aars: ["glance-appwidget-testing-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "23", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-appwidget-testing-nodeps", "androidx.glance_glance-appwidget", "androidx.glance_glance-testing", "kotlin-stdlib", "kotlinx_coroutines_test", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget/1.1.0-beta01/Android.bp index 0ace14f00..d7eda196f 100644 --- a/current/androidx/m2repository/androidx/glance/glance-appwidget/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-appwidget/1.1.0-beta01/Android.bp @@ -15,41 +15,15 @@ package { } android_library_import { - name: "androidx.glance_glance-appwidget-nodeps", - aars: ["glance-appwidget-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui-graphics", - "androidx.compose.ui_ui-unit", - "androidx.core_core-ktx", - "androidx.core_core-remoteviews", - "androidx.datastore_datastore", - "androidx.datastore_datastore-core", - "androidx.datastore_datastore-preferences", - "androidx.datastore_datastore-preferences-core", - "androidx.glance_glance", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance-appwidget", + aars: ["glance-appwidget-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-appwidget-nodeps", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui-graphics", @@ -63,6 +37,4 @@ android_library { "androidx.glance_glance", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-material/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-material/1.1.0-beta01/Android.bp index 930501a43..13a23a7eb 100644 --- a/current/androidx/m2repository/androidx/glance/glance-material/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-material/1.1.0-beta01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.glance_glance-material-nodeps", - aars: ["glance-material-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.material_material", - "androidx.compose.runtime_runtime", - "androidx.glance_glance", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance-material", + aars: ["glance-material-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-material-nodeps", "androidx.annotation_annotation", "androidx.compose.material_material", "androidx.compose.runtime_runtime", "androidx.glance_glance", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-material3/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-material3/1.1.0-beta01/Android.bp index 2d33b9210..353cd644b 100644 --- a/current/androidx/m2repository/androidx/glance/glance-material3/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-material3/1.1.0-beta01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.glance_glance-material3-nodeps", - aars: ["glance-material3-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.material3_material3", - "androidx.compose.runtime_runtime", - "androidx.core_core", - "androidx.glance_glance", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance-material3", + aars: ["glance-material3-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-material3-nodeps", "androidx.annotation_annotation", "androidx.compose.material3_material3", "androidx.compose.runtime_runtime", @@ -51,6 +31,4 @@ android_library { "androidx.glance_glance", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-preview/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/glance/glance-preview/1.0.0-alpha06/Android.bp index d26ea2912..e3903bc45 100644 --- a/current/androidx/m2repository/androidx/glance/glance-preview/1.0.0-alpha06/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-preview/1.0.0-alpha06/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.glance_glance-preview-nodeps", - aars: ["glance-preview-1.0.0-alpha06.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance-preview", + aars: ["glance-preview-1.0.0-alpha06.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-preview-nodeps", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-template/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/glance/glance-template/1.0.0-alpha06/Android.bp index 177b51e06..7ff0280e3 100644 --- a/current/androidx/m2repository/androidx/glance/glance-template/1.0.0-alpha06/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-template/1.0.0-alpha06/Android.bp @@ -15,42 +15,15 @@ package { } android_library_import { - name: "androidx.glance_glance-template-nodeps", - aars: ["glance-template-1.0.0-alpha06.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui-graphics", - "androidx.compose.ui_ui-unit", - "androidx.datastore_datastore-core", - "androidx.datastore_datastore-preferences", - "androidx.datastore_datastore-preferences-core", - "androidx.glance_glance", - "androidx.glance_glance-appwidget", - "androidx.work_work-runtime", - "androidx.work_work-runtime-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance-template", + aars: ["glance-template-1.0.0-alpha06.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-template-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.compose.runtime_runtime", @@ -65,6 +38,4 @@ android_library { "androidx.work_work-runtime-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-testing/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-testing/1.1.0-beta01/Android.bp index 3f411d25a..c7995aec5 100644 --- a/current/androidx/m2repository/androidx/glance/glance-testing/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-testing/1.1.0-beta01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.glance_glance-testing-nodeps", - aars: ["glance-testing-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "23", - static_libs: [ - "androidx.glance_glance", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance-testing", + aars: ["glance-testing-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "23", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-testing-nodeps", "androidx.glance_glance", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance-wear-tiles/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/glance/glance-wear-tiles/1.0.0-alpha06/Android.bp index 9caf3b649..f88600d4c 100644 --- a/current/androidx/m2repository/androidx/glance/glance-wear-tiles/1.0.0-alpha06/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance-wear-tiles/1.0.0-alpha06/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.glance_glance-wear-tiles-nodeps", - aars: ["glance-wear-tiles-1.0.0-alpha06.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui-graphics", - "androidx.compose.ui_ui-unit", - "androidx.glance_glance", - "androidx.glance_glance-template", - "androidx.lifecycle_lifecycle-runtime-ktx", - "androidx.lifecycle_lifecycle-service", - "androidx.wear.tiles_tiles", - "kotlin-stdlib", - "kotlinx_coroutines_guava", - ], -} - -android_library { name: "androidx.glance_glance-wear-tiles", + aars: ["glance-wear-tiles-1.0.0-alpha06.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-wear-tiles-nodeps", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui-graphics", "androidx.compose.ui_ui-unit", @@ -59,6 +35,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_guava", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/glance/glance/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance/1.1.0-beta01/Android.bp index a30f01bfe..0cfafb442 100644 --- a/current/androidx/m2repository/androidx/glance/glance/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/glance/glance/1.1.0-beta01/Android.bp @@ -15,41 +15,15 @@ package { } android_library_import { - name: "androidx.glance_glance-nodeps", - aars: ["glance-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui-graphics", - "androidx.compose.ui_ui-unit", - "androidx.concurrent_concurrent-futures-ktx", - "androidx.datastore_datastore-core", - "androidx.datastore_datastore-preferences", - "androidx.datastore_datastore-preferences-core", - "androidx.work_work-runtime", - "androidx.work_work-runtime-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.glance_glance", + aars: ["glance-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.glance_glance-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.compose.runtime_runtime", @@ -63,6 +37,4 @@ android_library { "androidx.work_work-runtime-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/graphics/graphics-path/1.0.0-rc01/Android.bp b/current/androidx/m2repository/androidx/graphics/graphics-path/1.0.0-rc01/Android.bp index 4f4fb830b..03f200a80 100644 --- a/current/androidx/m2repository/androidx/graphics/graphics-path/1.0.0-rc01/Android.bp +++ b/current/androidx/m2repository/androidx/graphics/graphics-path/1.0.0-rc01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.graphics_graphics-path-nodeps", - aars: ["graphics-path-1.0.0-rc01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.core_core", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.graphics_graphics-path", + aars: ["graphics-path-1.0.0-rc01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.graphics_graphics-path-nodeps", "androidx.core_core", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/gridlayout/gridlayout/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/gridlayout/gridlayout/1.1.0-alpha02/Android.bp index 0a30015b7..e59634d61 100644 --- a/current/androidx/m2repository/androidx/gridlayout/gridlayout/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/gridlayout/gridlayout/1.1.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.gridlayout_gridlayout-nodeps", - aars: ["gridlayout-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - ], -} - -android_library { name: "androidx.gridlayout_gridlayout", + aars: ["gridlayout-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.gridlayout_gridlayout-nodeps", "androidx.annotation_annotation", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/health/health-services-client/1.0.0-beta03/Android.bp b/current/androidx/m2repository/androidx/health/health-services-client/1.0.0-beta03/Android.bp index 9079dfdff..a2ab1a1c0 100644 --- a/current/androidx/m2repository/androidx/health/health-services-client/1.0.0-beta03/Android.bp +++ b/current/androidx/m2repository/androidx/health/health-services-client/1.0.0-beta03/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.health_health-services-client-nodeps", - aars: ["health-services-client-1.0.0-beta03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "30", - static_libs: [ - "androidx.annotation_annotation", - "androidx.concurrent_concurrent-futures-ktx", - "androidx.core_core-ktx", - "guava", - "guava-listenablefuture-prebuilt-jar", - "kotlin-stdlib", - "kotlinx_coroutines", - "libprotobuf-java-lite", - ], -} - -android_library { name: "androidx.health_health-services-client", + aars: ["health-services-client-1.0.0-beta03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "30", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.health_health-services-client-nodeps", "androidx.annotation_annotation", "androidx.concurrent_concurrent-futures-ktx", "androidx.core_core-ktx", @@ -55,6 +33,4 @@ android_library { "kotlinx_coroutines", "libprotobuf-java-lite", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha02/Android.bp index e55dd7bdd..fd5bdf46e 100644 --- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha02/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.heifwriter_heifwriter-nodeps", - aars: ["heifwriter-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "28", - static_libs: [ - "androidx.annotation_annotation", - ], -} - -android_library { name: "androidx.heifwriter_heifwriter", + aars: ["heifwriter-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "28", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.heifwriter_heifwriter-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/hilt/hilt-navigation-compose/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/hilt/hilt-navigation-compose/1.1.0-beta01/Android.bp index 2f013bea0..d2c3993cf 100644 --- a/current/androidx/m2repository/androidx/hilt/hilt-navigation-compose/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/hilt/hilt-navigation-compose/1.1.0-beta01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.hilt_hilt-navigation-compose-nodeps", - aars: ["hilt-navigation-compose-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.hilt_hilt-navigation", - "androidx.lifecycle_lifecycle-viewmodel-compose", - "androidx.navigation_navigation-compose", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.hilt_hilt-navigation-compose", + aars: ["hilt-navigation-compose-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.hilt_hilt-navigation-compose-nodeps", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui", "androidx.hilt_hilt-navigation", @@ -51,6 +31,4 @@ android_library { "androidx.navigation_navigation-compose", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/hilt/hilt-navigation/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/hilt/hilt-navigation/1.1.0-beta01/Android.bp index f1a8e6b38..71bb18f20 100644 --- a/current/androidx/m2repository/androidx/hilt/hilt-navigation/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/hilt/hilt-navigation/1.1.0-beta01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.hilt_hilt-navigation-nodeps", - aars: ["hilt-navigation-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.navigation_navigation-runtime", - "hilt_android", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.hilt_hilt-navigation", + aars: ["hilt-navigation-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.hilt_hilt-navigation-nodeps", "androidx.annotation_annotation", "androidx.navigation_navigation-runtime", "hilt_android", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/interpolator/interpolator/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/interpolator/interpolator/1.1.0-alpha01/Android.bp index 48a3181d0..68622da24 100644 --- a/current/androidx/m2repository/androidx/interpolator/interpolator/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/interpolator/interpolator/1.1.0-alpha01/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.interpolator_interpolator-nodeps", - aars: ["interpolator-1.1.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - ], -} - -android_library { name: "androidx.interpolator_interpolator", + aars: ["interpolator-1.1.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.interpolator_interpolator-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/javascriptengine/javascriptengine/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/javascriptengine/javascriptengine/1.0.0-alpha06/Android.bp index 20701eeda..734014258 100644 --- a/current/androidx/m2repository/androidx/javascriptengine/javascriptengine/1.0.0-alpha06/Android.bp +++ b/current/androidx/m2repository/androidx/javascriptengine/javascriptengine/1.0.0-alpha06/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.javascriptengine_javascriptengine-nodeps", - aars: ["javascriptengine-1.0.0-alpha06.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "guava", - ], -} - -android_library { name: "androidx.javascriptengine_javascriptengine", + aars: ["javascriptengine-1.0.0-alpha06.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.javascriptengine_javascriptengine-nodeps", "androidx.annotation_annotation", "androidx.concurrent_concurrent-futures", "androidx.core_core", "guava", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/leanback/leanback-grid/1.0.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/leanback/leanback-grid/1.0.0-alpha02/Android.bp index 0a0b5010e..4288bed30 100644 --- a/current/androidx/m2repository/androidx/leanback/leanback-grid/1.0.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/leanback/leanback-grid/1.0.0-alpha02/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.leanback_leanback-grid-nodeps", - aars: ["leanback-grid-1.0.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.recyclerview_recyclerview", - ], -} - -android_library { name: "androidx.leanback_leanback-grid", + aars: ["leanback-grid-1.0.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.leanback_leanback-grid-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.recyclerview_recyclerview", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/leanback/leanback-preference/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/leanback/leanback-preference/1.2.0-alpha03/Android.bp index 2cd5366f7..1c88323da 100644 --- a/current/androidx/m2repository/androidx/leanback/leanback-preference/1.2.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/leanback/leanback-preference/1.2.0-alpha03/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.leanback_leanback-preference-nodeps", - aars: ["leanback-preference-1.2.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.appcompat_appcompat", - "androidx.collection_collection", - "androidx.leanback_leanback", - "androidx.preference_preference", - "androidx.recyclerview_recyclerview", - ], -} - -android_library { name: "androidx.leanback_leanback-preference", + aars: ["leanback-preference-1.2.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.leanback_leanback-preference-nodeps", "androidx.annotation_annotation", "androidx.appcompat_appcompat", "androidx.collection_collection", @@ -51,6 +31,4 @@ android_library { "androidx.preference_preference", "androidx.recyclerview_recyclerview", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/leanback/leanback/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/leanback/leanback/1.2.0-alpha03/Android.bp index 0d820c240..4e71308ca 100644 --- a/current/androidx/m2repository/androidx/leanback/leanback/1.2.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/leanback/leanback/1.2.0-alpha03/Android.bp @@ -15,38 +15,15 @@ package { } android_library_import { - name: "androidx.leanback_leanback-nodeps", - aars: ["leanback-1.2.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.appcompat_appcompat", - "androidx.core_core", - "androidx.fragment_fragment", - "androidx.interpolator_interpolator", - "androidx.leanback_leanback-grid", - "androidx.media_media", - "androidx.recyclerview_recyclerview", - "androidx.vectordrawable_vectordrawable-animated", - ], -} - -android_library { name: "androidx.leanback_leanback", + aars: ["leanback-1.2.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.leanback_leanback-nodeps", "androidx.annotation_annotation", "androidx.appcompat_appcompat", "androidx.core_core", @@ -57,6 +34,4 @@ android_library { "androidx.recyclerview_recyclerview", "androidx.vectordrawable_vectordrawable-animated", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-java8/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-java8/2.8.0-alpha04/Android.bp index cac0da916..8fec36c60 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-java8/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-java8/2.8.0-alpha04/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.lifecycle_lifecycle-common-java8-nodeps", - jars: ["lifecycle-common-java8-2.8.0-alpha04.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.lifecycle_lifecycle-common-java8", + jars: ["lifecycle-common-java8-2.8.0-alpha04.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,10 +24,7 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.lifecycle_lifecycle-common-java8-nodeps", "androidx.annotation_annotation", "androidx.lifecycle_lifecycle-common", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-jvm/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-jvm/2.8.0-alpha04/Android.bp index 0773e8a75..32bcaea68 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-jvm/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-jvm/2.8.0-alpha04/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.lifecycle_lifecycle-common-nodeps", - jars: ["lifecycle-common-jvm-2.8.0-alpha04.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.lifecycle_lifecycle-common", + jars: ["lifecycle-common-jvm-2.8.0-alpha04.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,11 +24,8 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.lifecycle_lifecycle-common-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core-ktx/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core-ktx/2.8.0-alpha04/Android.bp index c403c6772..bb5cafaa3 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core-ktx/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core-ktx/2.8.0-alpha04/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-livedata-core-ktx-nodeps", - aars: ["lifecycle-livedata-core-ktx-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.lifecycle_lifecycle-livedata-core", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-livedata-core-ktx", + aars: ["lifecycle-livedata-core-ktx-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-livedata-core-ktx-nodeps", "androidx.lifecycle_lifecycle-livedata-core", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core/2.8.0-alpha04/Android.bp index d40a61ed3..353448735 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core/2.8.0-alpha04/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-livedata-core-nodeps", - aars: ["lifecycle-livedata-core-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.arch.core_core-common", - "androidx.arch.core_core-runtime", - "androidx.lifecycle_lifecycle-common", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-livedata-core", + aars: ["lifecycle-livedata-core-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-livedata-core-nodeps", "androidx.arch.core_core-common", "androidx.arch.core_core-runtime", "androidx.lifecycle_lifecycle-common", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-ktx/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-ktx/2.8.0-alpha04/Android.bp index f42cdca2b..de50fde29 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-ktx/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-ktx/2.8.0-alpha04/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-livedata-ktx-nodeps", - aars: ["lifecycle-livedata-ktx-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.lifecycle_lifecycle-livedata", - "androidx.lifecycle_lifecycle-livedata-core-ktx", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-livedata-ktx", + aars: ["lifecycle-livedata-ktx-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-livedata-ktx-nodeps", "androidx.lifecycle_lifecycle-livedata", "androidx.lifecycle_lifecycle-livedata-core-ktx", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/2.8.0-alpha04/Android.bp index a57581832..0ce04848f 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/2.8.0-alpha04/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-livedata-nodeps", - aars: ["lifecycle-livedata-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.arch.core_core-common", - "androidx.arch.core_core-runtime", - "androidx.lifecycle_lifecycle-livedata-core", - "androidx.lifecycle_lifecycle-livedata-core-ktx", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-livedata", + aars: ["lifecycle-livedata-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-livedata-nodeps", "androidx.arch.core_core-common", "androidx.arch.core_core-runtime", "androidx.lifecycle_lifecycle-livedata-core", @@ -51,6 +31,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-process/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-process/2.8.0-alpha04/Android.bp index 882189b30..4717d99a9 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-process/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-process/2.8.0-alpha04/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-process-nodeps", - aars: ["lifecycle-process-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.lifecycle_lifecycle-runtime", - "androidx.startup_startup-runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-process", + aars: ["lifecycle-process-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-process-nodeps", "androidx.annotation_annotation", "androidx.lifecycle_lifecycle-runtime", "androidx.startup_startup-runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-android/2.8.0-alpha04/Android.bp index be215d1d3..3f8e61737 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-android/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-android/2.8.0-alpha04/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-runtime-nodeps", - aars: ["lifecycle-runtime-android-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.arch.core_core-common", - "androidx.arch.core_core-runtime", - "androidx.lifecycle_lifecycle-common", - "androidx.profileinstaller_profileinstaller", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-runtime", + aars: ["lifecycle-runtime-android-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-runtime-nodeps", "androidx.annotation_annotation", "androidx.arch.core_core-common", "androidx.arch.core_core-runtime", @@ -53,6 +32,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-compose-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-compose-android/2.8.0-alpha04/Android.bp index 5dd834f91..e7a0bbcb8 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-compose-android/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-compose-android/2.8.0-alpha04/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-runtime-compose-nodeps", - aars: ["lifecycle-runtime-compose-android-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "androidx.lifecycle_lifecycle-runtime", - "androidx.lifecycle_lifecycle-runtime-ktx", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-runtime-compose", + aars: ["lifecycle-runtime-compose-android-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-runtime-compose-nodeps", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", "androidx.lifecycle_lifecycle-runtime", "androidx.lifecycle_lifecycle-runtime-ktx", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-ktx-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-ktx-android/2.8.0-alpha04/Android.bp index 197d8d7cf..e14f0a7b2 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-ktx-android/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-ktx-android/2.8.0-alpha04/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-runtime-ktx-nodeps", - aars: ["lifecycle-runtime-ktx-android-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.lifecycle_lifecycle-runtime", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-runtime-ktx", + aars: ["lifecycle-runtime-ktx-android-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-runtime-ktx-nodeps", "androidx.annotation_annotation", "androidx.lifecycle_lifecycle-runtime", "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-testing/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-testing/2.8.0-alpha04/Android.bp index 1caa9b830..b6a80dd63 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-testing/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-testing/2.8.0-alpha04/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-runtime-testing-nodeps", - aars: ["lifecycle-runtime-testing-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.lifecycle_lifecycle-runtime-ktx", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-runtime-testing", + aars: ["lifecycle-runtime-testing-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-runtime-testing-nodeps", "androidx.lifecycle_lifecycle-runtime-ktx", "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-service/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-service/2.8.0-alpha04/Android.bp index 532245176..658ac43d9 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-service/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-service/2.8.0-alpha04/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-service-nodeps", - aars: ["lifecycle-service-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.lifecycle_lifecycle-runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-service", + aars: ["lifecycle-service-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-service-nodeps", "androidx.lifecycle_lifecycle-runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/2.8.0-alpha04/Android.bp index c8f788e26..ccc53b826 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/2.8.0-alpha04/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-viewmodel-nodeps", - aars: ["lifecycle-viewmodel-android-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "kotlin-stdlib", - "kotlinx_coroutines", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-viewmodel", + aars: ["lifecycle-viewmodel-android-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-viewmodel-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", "kotlinx_coroutines", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-compose-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-compose-android/2.8.0-alpha04/Android.bp index 9a1485b0f..15e754c7b 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-compose-android/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-compose-android/2.8.0-alpha04/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-viewmodel-compose-nodeps", - aars: ["lifecycle-viewmodel-compose-android-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.lifecycle_lifecycle-common", - "androidx.lifecycle_lifecycle-viewmodel", - "androidx.lifecycle_lifecycle-viewmodel-savedstate", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-viewmodel-compose", + aars: ["lifecycle-viewmodel-compose-android-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-viewmodel-compose-nodeps", "androidx.annotation_annotation", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui", @@ -53,6 +32,4 @@ android_library { "androidx.lifecycle_lifecycle-viewmodel-savedstate", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx/2.8.0-alpha04/Android.bp index 8dd94ebbb..43b772ce9 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx/2.8.0-alpha04/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps", - aars: ["lifecycle-viewmodel-ktx-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.lifecycle_lifecycle-viewmodel", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-viewmodel-ktx", + aars: ["lifecycle-viewmodel-ktx-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps", "androidx.lifecycle_lifecycle-viewmodel", "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.8.0-alpha04/Android.bp index 6bef220b3..c7e720d74 100644 --- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.8.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.8.0-alpha04/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.lifecycle_lifecycle-viewmodel-savedstate-nodeps", - aars: ["lifecycle-viewmodel-savedstate-2.8.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core-ktx", - "androidx.lifecycle_lifecycle-livedata-core", - "androidx.lifecycle_lifecycle-viewmodel", - "androidx.savedstate_savedstate", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.lifecycle_lifecycle-viewmodel-savedstate", + aars: ["lifecycle-viewmodel-savedstate-2.8.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.lifecycle_lifecycle-viewmodel-savedstate-nodeps", "androidx.annotation_annotation", "androidx.core_core-ktx", "androidx.lifecycle_lifecycle-livedata-core", @@ -53,6 +32,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/loader/loader/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/loader/loader/1.2.0-alpha01/Android.bp index 10845bceb..accdbabb9 100644 --- a/current/androidx/m2repository/androidx/loader/loader/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/loader/loader/1.2.0-alpha01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.loader_loader-nodeps", - aars: ["loader-1.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.lifecycle_lifecycle-livedata-core", - "androidx.lifecycle_lifecycle-viewmodel", - ], -} - -android_library { name: "androidx.loader_loader", + aars: ["loader-1.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.loader_loader-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.lifecycle_lifecycle-livedata-core", "androidx.lifecycle_lifecycle-viewmodel", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/media/media/1.7.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/media/media/1.7.0-alpha02/Android.bp index 0e50e5f8a..fd951f8f3 100644 --- a/current/androidx/m2repository/androidx/media/media/1.7.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/media/media/1.7.0-alpha02/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.media_media-nodeps", - aars: ["media-1.7.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - ], -} - -android_library { name: "androidx.media_media", + aars: ["media-1.7.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.media_media-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/media2/media2-common/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-common/1.3.0-alpha01/Android.bp index 35a2b1a8e..4b8af42c5 100644 --- a/current/androidx/m2repository/androidx/media2/media2-common/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/media2/media2-common/1.3.0-alpha01/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.media2_media2-common-nodeps", - aars: ["media2-common-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "androidx.media_media", - "androidx.versionedparcelable_versionedparcelable", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.media2_media2-common", + aars: ["media2-common-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.media2_media2-common-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.concurrent_concurrent-futures", @@ -53,6 +32,4 @@ android_library { "androidx.versionedparcelable_versionedparcelable", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/media2/media2-exoplayer/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-exoplayer/1.3.0-alpha01/Android.bp index ab989f42d..6abd03f65 100644 --- a/current/androidx/m2repository/androidx/media2/media2-exoplayer/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/media2/media2-exoplayer/1.3.0-alpha01/Android.bp @@ -15,30 +15,14 @@ package { } android_library_import { - name: "androidx.media2_media2-exoplayer-nodeps", - aars: ["media2-exoplayer-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - ], -} - -android_library { name: "androidx.media2_media2-exoplayer", + aars: ["media2-exoplayer-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.media2_media2-exoplayer-nodeps", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/media2/media2-player/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-player/1.3.0-alpha01/Android.bp index 47afe5bf7..c781394a4 100644 --- a/current/androidx/m2repository/androidx/media2/media2-player/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/media2/media2-player/1.3.0-alpha01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.media2_media2-player-nodeps", - aars: ["media2-player-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.media2_media2-common", - "androidx.media2_media2-exoplayer", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.media2_media2-player", + aars: ["media2-player-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.media2_media2-player-nodeps", "androidx.collection_collection", "androidx.concurrent_concurrent-futures", "androidx.media2_media2-common", "androidx.media2_media2-exoplayer", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/media2/media2-session/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-session/1.3.0-alpha01/Android.bp index 078e8f85b..01cfd6931 100644 --- a/current/androidx/m2repository/androidx/media2/media2-session/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/media2/media2-session/1.3.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.media2_media2-session-nodeps", - aars: ["media2-session-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.media2_media2-common", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.media2_media2-session", + aars: ["media2-session-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.media2_media2-session-nodeps", "androidx.collection_collection", "androidx.concurrent_concurrent-futures", "androidx.media2_media2-common", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/media2/media2-widget/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-widget/1.3.0-alpha01/Android.bp index 0060bd018..6e897424a 100644 --- a/current/androidx/m2repository/androidx/media2/media2-widget/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/media2/media2-widget/1.3.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.media2_media2-widget-nodeps", - aars: ["media2-widget-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.appcompat_appcompat", - "androidx.media2_media2-session", - "androidx.palette_palette", - ], -} - -android_library { name: "androidx.media2_media2-widget", + aars: ["media2-widget-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.media2_media2-widget-nodeps", "androidx.appcompat_appcompat", "androidx.media2_media2-session", "androidx.palette_palette", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/mediarouter/mediarouter/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/mediarouter/mediarouter/1.5.0-alpha01/Android.bp index 7318da15d..378d59e75 100644 --- a/current/androidx/m2repository/androidx/mediarouter/mediarouter/1.5.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/mediarouter/mediarouter/1.5.0-alpha01/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.mediarouter_mediarouter-nodeps", - aars: ["mediarouter-1.5.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.appcompat_appcompat", - "androidx.appcompat_appcompat-resources", - "androidx.core_core", - "androidx.media_media", - "androidx.palette_palette", - "androidx.recyclerview_recyclerview", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.mediarouter_mediarouter", + aars: ["mediarouter-1.5.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.mediarouter_mediarouter-nodeps", "androidx.appcompat_appcompat", "androidx.appcompat_appcompat-resources", "androidx.core_core", @@ -53,6 +32,4 @@ android_library { "androidx.recyclerview_recyclerview", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-common-ktx/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-common-ktx/2.8.0-alpha03/Android.bp index bb1c7764c..7db34df7f 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-common-ktx/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-common-ktx/2.8.0-alpha03/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.navigation_navigation-common-ktx-nodeps", - aars: ["navigation-common-ktx-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.navigation_navigation-common", - ], -} - -android_library { name: "androidx.navigation_navigation-common-ktx", + aars: ["navigation-common-ktx-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-common-ktx-nodeps", "androidx.navigation_navigation-common", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-common/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-common/2.8.0-alpha03/Android.bp index 78823edf6..a7fe8884f 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-common/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-common/2.8.0-alpha03/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.navigation_navigation-common-nodeps", - aars: ["navigation-common-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection-ktx", - "androidx.core_core-ktx", - "androidx.lifecycle_lifecycle-common", - "androidx.lifecycle_lifecycle-runtime-ktx", - "androidx.lifecycle_lifecycle-viewmodel-ktx", - "androidx.lifecycle_lifecycle-viewmodel-savedstate", - "androidx.profileinstaller_profileinstaller", - "androidx.savedstate_savedstate-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.navigation_navigation-common", + aars: ["navigation-common-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-common-nodeps", "androidx.annotation_annotation", "androidx.collection_collection-ktx", "androidx.core_core-ktx", @@ -59,6 +35,4 @@ android_library { "androidx.savedstate_savedstate-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-compose/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-compose/2.8.0-alpha03/Android.bp index a66bf16e3..e2fd29f4c 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-compose/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-compose/2.8.0-alpha03/Android.bp @@ -15,38 +15,15 @@ package { } android_library_import { - name: "androidx.navigation_navigation-compose-nodeps", - aars: ["navigation-compose-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.activity_activity-compose", - "androidx.compose.animation_animation", - "androidx.compose.foundation_foundation-layout", - "androidx.compose.runtime_runtime", - "androidx.compose.runtime_runtime-saveable", - "androidx.compose.ui_ui", - "androidx.lifecycle_lifecycle-viewmodel-compose", - "androidx.navigation_navigation-runtime-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.navigation_navigation-compose", + aars: ["navigation-compose-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-compose-nodeps", "androidx.activity_activity-compose", "androidx.compose.animation_animation", "androidx.compose.foundation_foundation-layout", @@ -57,6 +34,4 @@ android_library { "androidx.navigation_navigation-runtime-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-fragment-ktx/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-fragment-ktx/2.8.0-alpha03/Android.bp index 7562ccd0a..4954756ee 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-fragment-ktx/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-fragment-ktx/2.8.0-alpha03/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.navigation_navigation-fragment-ktx-nodeps", - aars: ["navigation-fragment-ktx-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.navigation_navigation-fragment", - "androidx.navigation_navigation-runtime-ktx", - ], -} - -android_library { name: "androidx.navigation_navigation-fragment-ktx", + aars: ["navigation-fragment-ktx-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-fragment-ktx-nodeps", "androidx.navigation_navigation-fragment", "androidx.navigation_navigation-runtime-ktx", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-fragment/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-fragment/2.8.0-alpha03/Android.bp index 77b3a57dd..dea69f8b8 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-fragment/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-fragment/2.8.0-alpha03/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.navigation_navigation-fragment-nodeps", - aars: ["navigation-fragment-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.fragment_fragment-ktx", - "androidx.navigation_navigation-runtime", - "androidx.slidingpanelayout_slidingpanelayout", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.navigation_navigation-fragment", + aars: ["navigation-fragment-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-fragment-nodeps", "androidx.fragment_fragment-ktx", "androidx.navigation_navigation-runtime", "androidx.slidingpanelayout_slidingpanelayout", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-runtime-ktx/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-runtime-ktx/2.8.0-alpha03/Android.bp index a9f30115d..202ee8770 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-runtime-ktx/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-runtime-ktx/2.8.0-alpha03/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.navigation_navigation-runtime-ktx-nodeps", - aars: ["navigation-runtime-ktx-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.navigation_navigation-common-ktx", - "androidx.navigation_navigation-runtime", - ], -} - -android_library { name: "androidx.navigation_navigation-runtime-ktx", + aars: ["navigation-runtime-ktx-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-runtime-ktx-nodeps", "androidx.navigation_navigation-common-ktx", "androidx.navigation_navigation-runtime", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-runtime/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-runtime/2.8.0-alpha03/Android.bp index 2ce8c02b9..667d9bf37 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-runtime/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-runtime/2.8.0-alpha03/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.navigation_navigation-runtime-nodeps", - aars: ["navigation-runtime-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity-ktx", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.lifecycle_lifecycle-runtime-ktx", - "androidx.lifecycle_lifecycle-viewmodel-ktx", - "androidx.navigation_navigation-common", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.navigation_navigation-runtime", + aars: ["navigation-runtime-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-runtime-nodeps", "androidx.activity_activity-ktx", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -53,6 +32,4 @@ android_library { "androidx.navigation_navigation-common", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-testing/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-testing/2.8.0-alpha03/Android.bp index b4c2c2a4c..b8e8f86a5 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-testing/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-testing/2.8.0-alpha03/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.navigation_navigation-testing-nodeps", - aars: ["navigation-testing-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.lifecycle_lifecycle-runtime-testing", - "androidx.navigation_navigation-runtime", - ], -} - -android_library { name: "androidx.navigation_navigation-testing", + aars: ["navigation-testing-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-testing-nodeps", "androidx.lifecycle_lifecycle-runtime-testing", "androidx.navigation_navigation-runtime", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-ui-ktx/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-ui-ktx/2.8.0-alpha03/Android.bp index a8bb17053..f1ec84ebe 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-ui-ktx/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-ui-ktx/2.8.0-alpha03/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.navigation_navigation-ui-ktx-nodeps", - aars: ["navigation-ui-ktx-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.navigation_navigation-runtime-ktx", - "androidx.navigation_navigation-ui", - ], -} - -android_library { name: "androidx.navigation_navigation-ui-ktx", + aars: ["navigation-ui-ktx-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-ui-ktx-nodeps", "androidx.navigation_navigation-runtime-ktx", "androidx.navigation_navigation-ui", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/navigation/navigation-ui/2.8.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-ui/2.8.0-alpha03/Android.bp index 56edc0330..eabe357fb 100644 --- a/current/androidx/m2repository/androidx/navigation/navigation-ui/2.8.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/navigation/navigation-ui/2.8.0-alpha03/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.navigation_navigation-ui-nodeps", - aars: ["navigation-ui-2.8.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation-experimental", - "androidx.customview_customview", - "androidx.drawerlayout_drawerlayout", - "androidx.navigation_navigation-runtime", - "androidx.transition_transition", - "com.google.android.material_material", - ], -} - -android_library { name: "androidx.navigation_navigation-ui", + aars: ["navigation-ui-2.8.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.navigation_navigation-ui-nodeps", "androidx.annotation_annotation-experimental", "androidx.customview_customview", "androidx.drawerlayout_drawerlayout", @@ -51,6 +31,4 @@ android_library { "androidx.transition_transition", "com.google.android.material_material", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/paging/paging-common-android/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-common-android/3.3.0-alpha05/Android.bp index f60487055..5ffef0274 100644 --- a/current/androidx/m2repository/androidx/paging/paging-common-android/3.3.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/paging/paging-common-android/3.3.0-alpha05/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.paging_paging-common-nodeps", - aars: ["paging-common-android-3.3.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.arch.core_core-common", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.paging_paging-common", + aars: ["paging-common-android-3.3.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.paging_paging-common-nodeps", "androidx.annotation_annotation", "androidx.arch.core_core-common", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/paging/paging-common-ktx/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-common-ktx/3.3.0-alpha05/Android.bp index db2290bfc..6b2dc5f9d 100644 --- a/current/androidx/m2repository/androidx/paging/paging-common-ktx/3.3.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/paging/paging-common-ktx/3.3.0-alpha05/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.paging_paging-common-ktx-nodeps", - jars: ["paging-common-ktx-3.3.0-alpha05.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.paging_paging-common-ktx", + jars: ["paging-common-ktx-3.3.0-alpha05.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,9 +24,6 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.paging_paging-common-ktx-nodeps", "androidx.paging_paging-common", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/paging/paging-compose-android/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-compose-android/3.3.0-alpha05/Android.bp index 01bc9d1dd..2b0ce0b78 100644 --- a/current/androidx/m2repository/androidx/paging/paging-compose-android/3.3.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/paging/paging-compose-android/3.3.0-alpha05/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.paging_paging-compose-nodeps", - aars: ["paging-compose-android-3.3.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.compose.foundation_foundation", - "androidx.compose.runtime_runtime", - "androidx.paging_paging-common", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.paging_paging-compose", + aars: ["paging-compose-android-3.3.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.paging_paging-compose-nodeps", "androidx.compose.foundation_foundation", "androidx.compose.runtime_runtime", "androidx.paging_paging-common", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/paging/paging-guava/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-guava/3.3.0-alpha05/Android.bp index c750dd688..de080074a 100644 --- a/current/androidx/m2repository/androidx/paging/paging-guava/3.3.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/paging/paging-guava/3.3.0-alpha05/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.paging_paging-guava-nodeps", - aars: ["paging-guava-3.3.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.paging_paging-common", - "guava", - "kotlin-stdlib", - "kotlinx_coroutines_guava", - ], -} - -android_library { name: "androidx.paging_paging-guava", + aars: ["paging-guava-3.3.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.paging_paging-guava-nodeps", "androidx.paging_paging-common", "guava", "kotlin-stdlib", "kotlinx_coroutines_guava", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/paging/paging-runtime/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-runtime/3.3.0-alpha05/Android.bp index e8daa61f3..6c26fa41f 100644 --- a/current/androidx/m2repository/androidx/paging/paging-runtime/3.3.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/paging/paging-runtime/3.3.0-alpha05/Android.bp @@ -15,38 +15,15 @@ package { } android_library_import { - name: "androidx.paging_paging-runtime-nodeps", - aars: ["paging-runtime-3.3.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.core_core-ktx", - "androidx.lifecycle_lifecycle-livedata-ktx", - "androidx.lifecycle_lifecycle-runtime-ktx", - "androidx.lifecycle_lifecycle-viewmodel-ktx", - "androidx.paging_paging-common", - "androidx.paging_paging-common-ktx", - "androidx.recyclerview_recyclerview", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.paging_paging-runtime", + aars: ["paging-runtime-3.3.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.paging_paging-runtime-nodeps", "androidx.core_core-ktx", "androidx.lifecycle_lifecycle-livedata-ktx", "androidx.lifecycle_lifecycle-runtime-ktx", @@ -57,6 +34,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/palette/palette/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/palette/palette/1.1.0-alpha01/Android.bp index 0f0f5bf0a..cd204f090 100644 --- a/current/androidx/m2repository/androidx/palette/palette/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/palette/palette/1.1.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.palette_palette-nodeps", - aars: ["palette-1.1.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.collection_collection", - "androidx.core_core", - ], -} - -android_library { name: "androidx.palette_palette", + aars: ["palette-1.1.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.palette_palette-nodeps", "androidx.collection_collection", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/percentlayout/percentlayout/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/percentlayout/percentlayout/1.1.0-alpha01/Android.bp index 8297340e6..7945e8938 100644 --- a/current/androidx/m2repository/androidx/percentlayout/percentlayout/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/percentlayout/percentlayout/1.1.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.percentlayout_percentlayout-nodeps", - aars: ["percentlayout-1.1.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - ], -} - -android_library { name: "androidx.percentlayout_percentlayout", + aars: ["percentlayout-1.1.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.percentlayout_percentlayout-nodeps", "androidx.annotation_annotation", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/preference/preference/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/preference/preference/1.3.0-alpha01/Android.bp index 8373a693d..f2b5d6902 100644 --- a/current/androidx/m2repository/androidx/preference/preference/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/preference/preference/1.3.0-alpha01/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.preference_preference-nodeps", - aars: ["preference-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity-ktx", - "androidx.annotation_annotation", - "androidx.appcompat_appcompat", - "androidx.collection_collection", - "androidx.core_core", - "androidx.fragment_fragment-ktx", - "androidx.recyclerview_recyclerview", - "androidx.slidingpanelayout_slidingpanelayout", - ], -} - -android_library { name: "androidx.preference_preference", + aars: ["preference-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.preference_preference-nodeps", "androidx.activity_activity-ktx", "androidx.annotation_annotation", "androidx.appcompat_appcompat", @@ -55,6 +33,4 @@ android_library { "androidx.recyclerview_recyclerview", "androidx.slidingpanelayout_slidingpanelayout", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/print/print/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/print/print/1.1.0-beta01/Android.bp index 66da3d068..747a99448 100644 --- a/current/androidx/m2repository/androidx/print/print/1.1.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/print/print/1.1.0-beta01/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.print_print-nodeps", - aars: ["print-1.1.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - ], -} - -android_library { name: "androidx.print_print", + aars: ["print-1.1.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.print_print-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices-java/1.1.0-beta05/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices-java/1.1.0-beta05/Android.bp index f66efce44..69a03a940 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices-java/1.1.0-beta05/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices-java/1.1.0-beta05/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.privacysandbox.ads_ads-adservices-java-nodeps", - aars: ["ads-adservices-java-1.1.0-beta05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.concurrent_concurrent-futures", - "androidx.core_core-ktx", - "androidx.privacysandbox.ads_ads-adservices", - "guava-listenablefuture-prebuilt-jar", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.privacysandbox.ads_ads-adservices-java", + aars: ["ads-adservices-java-1.1.0-beta05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.privacysandbox.ads_ads-adservices-java-nodeps", "androidx.annotation_annotation", "androidx.concurrent_concurrent-futures", "androidx.core_core-ktx", @@ -53,6 +32,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices/1.1.0-beta05/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices/1.1.0-beta05/Android.bp index 6d844d53f..08fdb8c4d 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices/1.1.0-beta05/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices/1.1.0-beta05/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.privacysandbox.ads_ads-adservices-nodeps", - aars: ["ads-adservices-1.1.0-beta05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core-ktx", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.privacysandbox.ads_ads-adservices", + aars: ["ads-adservices-1.1.0-beta05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.privacysandbox.ads_ads-adservices-nodeps", "androidx.annotation_annotation", "androidx.core_core-ktx", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-client/1.0.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-client/1.0.0-alpha13/Android.bp index ea386d821..b139c3c31 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-client/1.0.0-alpha13/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-client/1.0.0-alpha13/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.privacysandbox.sdkruntime_sdkruntime-client-nodeps", - aars: ["sdkruntime-client-1.0.0-alpha13.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity", - "androidx.core_core", - "androidx.core_core-ktx", - "androidx.privacysandbox.sdkruntime_sdkruntime-core", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.privacysandbox.sdkruntime_sdkruntime-client", + aars: ["sdkruntime-client-1.0.0-alpha13.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.privacysandbox.sdkruntime_sdkruntime-client-nodeps", "androidx.activity_activity", "androidx.core_core", "androidx.core_core-ktx", @@ -51,6 +31,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-core/1.0.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-core/1.0.0-alpha13/Android.bp index c098f475b..33376fd79 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-core/1.0.0-alpha13/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-core/1.0.0-alpha13/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.privacysandbox.sdkruntime_sdkruntime-core-nodeps", - aars: ["sdkruntime-core-1.0.0-alpha13.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.activity_activity", - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.core_core-ktx", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.privacysandbox.sdkruntime_sdkruntime-core", + aars: ["sdkruntime-core-1.0.0-alpha13.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.privacysandbox.sdkruntime_sdkruntime-core-nodeps", "androidx.activity_activity", "androidx.annotation_annotation", "androidx.core_core", "androidx.core_core-ktx", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apicompiler/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apicompiler/1.0.0-alpha08/Android.bp index 4f04cae6b..d47fb2315 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apicompiler/1.0.0-alpha08/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apicompiler/1.0.0-alpha08/Android.bp @@ -15,21 +15,13 @@ package { } java_import_host { - name: "androidx.privacysandbox.tools_tools-apicompiler-nodeps", - jars: ["tools-apicompiler-1.0.0-alpha08.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.privacysandbox.tools_tools-apicompiler", + jars: ["tools-apicompiler-1.0.0-alpha08.jar"], static_libs: [ - "androidx.privacysandbox.tools_tools-apicompiler-nodeps", "androidx.privacysandbox.tools_tools", "androidx.privacysandbox.tools_tools-core", "kotlin-stdlib", "kotlinpoet", "symbol-processing-api", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apigenerator/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apigenerator/1.0.0-alpha08/Android.bp index 616768610..7a798e21a 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apigenerator/1.0.0-alpha08/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apigenerator/1.0.0-alpha08/Android.bp @@ -15,15 +15,9 @@ package { } java_import_host { - name: "androidx.privacysandbox.tools_tools-apigenerator-nodeps", - jars: ["tools-apigenerator-1.0.0-alpha08.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.privacysandbox.tools_tools-apigenerator", + jars: ["tools-apigenerator-1.0.0-alpha08.jar"], static_libs: [ - "androidx.privacysandbox.tools_tools-apigenerator-nodeps", "androidx.privacysandbox.tools_tools", "androidx.privacysandbox.tools_tools-core", "kotlin-stdlib", @@ -32,6 +26,4 @@ java_library_host { "ow2-asm", "ow2-asm-commons", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apipackager/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apipackager/1.0.0-alpha08/Android.bp index 763b7496e..a4450b754 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apipackager/1.0.0-alpha08/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apipackager/1.0.0-alpha08/Android.bp @@ -15,15 +15,9 @@ package { } java_import_host { - name: "androidx.privacysandbox.tools_tools-apipackager-nodeps", - jars: ["tools-apipackager-1.0.0-alpha08.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.privacysandbox.tools_tools-apipackager", + jars: ["tools-apipackager-1.0.0-alpha08.jar"], static_libs: [ - "androidx.privacysandbox.tools_tools-apipackager-nodeps", "androidx.privacysandbox.tools_tools", "androidx.privacysandbox.tools_tools-core", "kotlin-stdlib", @@ -31,6 +25,4 @@ java_library_host { "ow2-asm", "ow2-asm-commons", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-core/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-core/1.0.0-alpha08/Android.bp index 136e61ba9..fa6b65fc4 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-core/1.0.0-alpha08/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-core/1.0.0-alpha08/Android.bp @@ -15,21 +15,13 @@ package { } java_import_host { - name: "androidx.privacysandbox.tools_tools-core-nodeps", - jars: ["tools-core-1.0.0-alpha08.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.privacysandbox.tools_tools-core", + jars: ["tools-core-1.0.0-alpha08.jar"], static_libs: [ - "androidx.privacysandbox.tools_tools-core-nodeps", "androidx.privacysandbox.tools_tools", "guava", "kotlin-stdlib", "kotlinpoet", "libprotobuf-java-full", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools/1.0.0-alpha08/Android.bp index ee4308984..3c0a90f08 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools/1.0.0-alpha08/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools/1.0.0-alpha08/Android.bp @@ -15,18 +15,10 @@ package { } java_import_host { - name: "androidx.privacysandbox.tools_tools-nodeps", - jars: ["tools-1.0.0-alpha08.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.privacysandbox.tools_tools", + jars: ["tools-1.0.0-alpha08.jar"], static_libs: [ - "androidx.privacysandbox.tools_tools-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-client/1.0.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-client/1.0.0-alpha07/Android.bp index 9c5e3dcc6..269387535 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-client/1.0.0-alpha07/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-client/1.0.0-alpha07/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.privacysandbox.ui_ui-client-nodeps", - aars: ["ui-client-1.0.0-alpha07.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.customview_customview-poolingcontainer", - "androidx.lifecycle_lifecycle-common", - "androidx.privacysandbox.sdkruntime_sdkruntime-client", - "androidx.privacysandbox.ui_ui-core", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.privacysandbox.ui_ui-client", + aars: ["ui-client-1.0.0-alpha07.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.privacysandbox.ui_ui-client-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.customview_customview-poolingcontainer", @@ -53,6 +32,4 @@ android_library { "androidx.privacysandbox.ui_ui-core", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-core/1.0.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-core/1.0.0-alpha07/Android.bp index 6043f8b1d..895edb946 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-core/1.0.0-alpha07/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-core/1.0.0-alpha07/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.privacysandbox.ui_ui-core-nodeps", - aars: ["ui-core-1.0.0-alpha07.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.privacysandbox.ui_ui-core", + aars: ["ui-core-1.0.0-alpha07.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.privacysandbox.ui_ui-core-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-provider/1.0.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-provider/1.0.0-alpha07/Android.bp index af7a0cb20..baf8e3e0d 100644 --- a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-provider/1.0.0-alpha07/Android.bp +++ b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-provider/1.0.0-alpha07/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.privacysandbox.ui_ui-provider-nodeps", - aars: ["ui-provider-1.0.0-alpha07.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.privacysandbox.ui_ui-core", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.privacysandbox.ui_ui-provider", + aars: ["ui-provider-1.0.0-alpha07.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.privacysandbox.ui_ui-provider-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.privacysandbox.ui_ui-core", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/profileinstaller/profileinstaller/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/profileinstaller/profileinstaller/1.4.0-alpha01/Android.bp index 1c623653e..325d76161 100644 --- a/current/androidx/m2repository/androidx/profileinstaller/profileinstaller/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/profileinstaller/profileinstaller/1.4.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.profileinstaller_profileinstaller-nodeps", - aars: ["profileinstaller-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.concurrent_concurrent-futures", - "androidx.startup_startup-runtime", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.profileinstaller_profileinstaller", + aars: ["profileinstaller-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.profileinstaller_profileinstaller-nodeps", "androidx.annotation_annotation", "androidx.concurrent_concurrent-futures", "androidx.startup_startup-runtime", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/recommendation/recommendation/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/recommendation/recommendation/1.1.0-alpha01/Android.bp index 9371936ea..9c2736928 100644 --- a/current/androidx/m2repository/androidx/recommendation/recommendation/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/recommendation/recommendation/1.1.0-alpha01/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.recommendation_recommendation-nodeps", - aars: ["recommendation-1.1.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - ], -} - -android_library { name: "androidx.recommendation_recommendation", + aars: ["recommendation-1.1.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.recommendation_recommendation-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/recyclerview/recyclerview-selection/1.2.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/recyclerview/recyclerview-selection/1.2.0-alpha02/Android.bp index 4d9f944f6..48ac0858d 100644 --- a/current/androidx/m2repository/androidx/recyclerview/recyclerview-selection/1.2.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/recyclerview/recyclerview-selection/1.2.0-alpha02/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.recyclerview_recyclerview-selection-nodeps", - aars: ["recyclerview-selection-1.2.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.recyclerview_recyclerview", - ], -} - -android_library { name: "androidx.recyclerview_recyclerview-selection", + aars: ["recyclerview-selection-1.2.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.recyclerview_recyclerview-selection-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.recyclerview_recyclerview", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/recyclerview/recyclerview/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/recyclerview/recyclerview/1.4.0-alpha01/Android.bp index a337fbc08..c51b6afc0 100644 --- a/current/androidx/m2repository/androidx/recyclerview/recyclerview/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/recyclerview/recyclerview/1.4.0-alpha01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.recyclerview_recyclerview-nodeps", - aars: ["recyclerview-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.customview_customview", - "androidx.customview_customview-poolingcontainer", - "androidx.profileinstaller_profileinstaller", - ], -} - -android_library { name: "androidx.recyclerview_recyclerview", + aars: ["recyclerview-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.recyclerview_recyclerview-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", @@ -51,6 +31,4 @@ android_library { "androidx.customview_customview-poolingcontainer", "androidx.profileinstaller_profileinstaller", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/remotecallback/remotecallback-processor/1.0.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/remotecallback/remotecallback-processor/1.0.0-alpha02/Android.bp index 0b4c507b7..4290e79c9 100644 --- a/current/androidx/m2repository/androidx/remotecallback/remotecallback-processor/1.0.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/remotecallback/remotecallback-processor/1.0.0-alpha02/Android.bp @@ -15,18 +15,10 @@ package { } java_import_host { - name: "androidx.remotecallback_remotecallback-processor-nodeps", - jars: ["remotecallback-processor-1.0.0-alpha02.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.remotecallback_remotecallback-processor", + jars: ["remotecallback-processor-1.0.0-alpha02.jar"], static_libs: [ - "androidx.remotecallback_remotecallback-processor-nodeps", "androidx.annotation_annotation", "javapoet", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/remotecallback/remotecallback/1.0.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/remotecallback/remotecallback/1.0.0-alpha02/Android.bp index 61b7114c1..e94fdcff2 100644 --- a/current/androidx/m2repository/androidx/remotecallback/remotecallback/1.0.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/remotecallback/remotecallback/1.0.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.remotecallback_remotecallback-nodeps", - aars: ["remotecallback-1.0.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - ], -} - -android_library { name: "androidx.remotecallback_remotecallback", + aars: ["remotecallback-1.0.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.remotecallback_remotecallback-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/resourceinspection/resourceinspection-annotation/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/resourceinspection/resourceinspection-annotation/1.1.0-alpha01/Android.bp index 84638306c..5211b767f 100644 --- a/current/androidx/m2repository/androidx/resourceinspection/resourceinspection-annotation/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/resourceinspection/resourceinspection-annotation/1.1.0-alpha01/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.resourceinspection_resourceinspection-annotation-nodeps", - jars: ["resourceinspection-annotation-1.1.0-alpha01.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.resourceinspection_resourceinspection-annotation", + jars: ["resourceinspection-annotation-1.1.0-alpha01.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,9 +24,6 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.resourceinspection_resourceinspection-annotation-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-common-jvm/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-common-jvm/2.7.0-alpha01/Android.bp index eae6f5157..61e6e8eac 100644 --- a/current/androidx/m2repository/androidx/room/room-common-jvm/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-common-jvm/2.7.0-alpha01/Android.bp @@ -15,19 +15,8 @@ package { } java_import { - name: "androidx.room_room-common-nodeps", - jars: ["room-common-jvm-2.7.0-alpha01.jar"], - sdk_version: "34", - host_supported: true, - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.room_room-common", + jars: ["room-common-jvm-2.7.0-alpha01.jar"], sdk_version: "34", host_supported: true, apex_available: [ @@ -36,10 +25,7 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.room_room-common-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-compiler-processing/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-compiler-processing/2.7.0-alpha01/Android.bp index 5036ac20d..fcad370be 100644 --- a/current/androidx/m2repository/androidx/room/room-compiler-processing/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-compiler-processing/2.7.0-alpha01/Android.bp @@ -15,15 +15,9 @@ package { } java_import_host { - name: "androidx.room_room-compiler-processing-nodeps", - jars: ["room-compiler-processing-2.7.0-alpha01.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.room_room-compiler-processing", + jars: ["room-compiler-processing-2.7.0-alpha01.jar"], static_libs: [ - "androidx.room_room-compiler-processing-nodeps", "auto_common", "auto_value_annotations", "guava", @@ -35,6 +29,4 @@ java_library_host { "kotlinpoet-javapoet", "symbol-processing-api", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-compiler/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-compiler/2.7.0-alpha01/Android.bp index 9bbe57d70..33738d902 100644 --- a/current/androidx/m2repository/androidx/room/room-compiler/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-compiler/2.7.0-alpha01/Android.bp @@ -15,15 +15,9 @@ package { } java_import_host { - name: "androidx.room_room-compiler-nodeps", - jars: ["room-compiler-2.7.0-alpha01.jar"], - sdk_version: "34", -} - -java_library_host { name: "androidx.room_room-compiler", + jars: ["room-compiler-2.7.0-alpha01.jar"], static_libs: [ - "androidx.room_room-compiler-nodeps", "androidx.room_room-common", "androidx.room_room-compiler-processing", "androidx.room_room-migration", @@ -39,6 +33,4 @@ java_library_host { "symbol-processing-api", "xerial-sqlite-jdbc", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-guava/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-guava/2.7.0-alpha01/Android.bp index 26079403b..80fcb5a98 100644 --- a/current/androidx/m2repository/androidx/room/room-guava/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-guava/2.7.0-alpha01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.room_room-guava-nodeps", - aars: ["room-guava-2.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.arch.core_core-runtime", - "androidx.concurrent_concurrent-futures", - "androidx.room_room-common", - "androidx.room_room-runtime", - ], -} - -android_library { name: "androidx.room_room-guava", + aars: ["room-guava-2.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.room_room-guava-nodeps", "androidx.annotation_annotation", "androidx.arch.core_core-runtime", "androidx.concurrent_concurrent-futures", "androidx.room_room-common", "androidx.room_room-runtime", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-ktx/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-ktx/2.7.0-alpha01/Android.bp index c8553d353..4e68d0515 100644 --- a/current/androidx/m2repository/androidx/room/room-ktx/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-ktx/2.7.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.room_room-ktx-nodeps", - aars: ["room-ktx-2.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.room_room-common", - "androidx.room_room-runtime", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.room_room-ktx", + aars: ["room-ktx-2.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.room_room-ktx-nodeps", "androidx.room_room-common", "androidx.room_room-runtime", "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-migration/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-migration/2.7.0-alpha01/Android.bp index ef5e42c37..21d743198 100644 --- a/current/androidx/m2repository/androidx/room/room-migration/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-migration/2.7.0-alpha01/Android.bp @@ -15,19 +15,8 @@ package { } java_import { - name: "androidx.room_room-migration-nodeps", - jars: ["room-migration-2.7.0-alpha01.jar"], - sdk_version: "34", - host_supported: true, - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.room_room-migration", + jars: ["room-migration-2.7.0-alpha01.jar"], sdk_version: "34", host_supported: true, apex_available: [ @@ -36,11 +25,8 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.room_room-migration-nodeps", "androidx.room_room-common", "gson", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-paging-guava/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-paging-guava/2.7.0-alpha01/Android.bp index f05c6ff44..97c6393d8 100644 --- a/current/androidx/m2repository/androidx/room/room-paging-guava/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-paging-guava/2.7.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.room_room-paging-guava-nodeps", - aars: ["room-paging-guava-2.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.paging_paging-guava", - "androidx.room_room-guava", - "androidx.room_room-paging", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.room_room-paging-guava", + aars: ["room-paging-guava-2.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.room_room-paging-guava-nodeps", "androidx.paging_paging-guava", "androidx.room_room-guava", "androidx.room_room-paging", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-paging/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-paging/2.7.0-alpha01/Android.bp index d1e2677c3..7211552a7 100644 --- a/current/androidx/m2repository/androidx/room/room-paging/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-paging/2.7.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.room_room-paging-nodeps", - aars: ["room-paging-2.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.paging_paging-common", - "androidx.room_room-ktx", - "androidx.room_room-runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.room_room-paging", + aars: ["room-paging-2.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.room_room-paging-nodeps", "androidx.paging_paging-common", "androidx.room_room-ktx", "androidx.room_room-runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-runtime-android/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-runtime-android/2.7.0-alpha01/Android.bp index d8e4e73fe..fff7da953 100644 --- a/current/androidx/m2repository/androidx/room/room-runtime-android/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-runtime-android/2.7.0-alpha01/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.room_room-runtime-nodeps", - aars: ["room-runtime-android-2.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.arch.core_core-runtime", - "androidx.room_room-common", - "androidx.sqlite_sqlite", - "androidx.sqlite_sqlite-framework", - "kotlin-stdlib", - "kotlinx_atomicfu", - "kotlinx_coroutines", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.room_room-runtime", + aars: ["room-runtime-android-2.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.room_room-runtime-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.arch.core_core-runtime", @@ -59,6 +35,4 @@ android_library { "kotlinx_coroutines", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/room/room-testing/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-testing/2.7.0-alpha01/Android.bp index 4f9b5a8f7..2c1a07273 100644 --- a/current/androidx/m2repository/androidx/room/room-testing/2.7.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/room/room-testing/2.7.0-alpha01/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.room_room-testing-nodeps", - aars: ["room-testing-2.7.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.arch.core_core-runtime", - "androidx.room_room-common", - "androidx.room_room-migration", - "androidx.room_room-runtime", - "androidx.sqlite_sqlite", - "androidx.sqlite_sqlite-framework", - "junit", - ], -} - -android_library { name: "androidx.room_room-testing", + aars: ["room-testing-2.7.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.room_room-testing-nodeps", "androidx.arch.core_core-runtime", "androidx.room_room-common", "androidx.room_room-migration", @@ -53,6 +32,4 @@ android_library { "androidx.sqlite_sqlite-framework", "junit", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/savedstate/savedstate-ktx/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/savedstate/savedstate-ktx/1.3.0-alpha01/Android.bp index 0583fcc07..9d77ca09f 100644 --- a/current/androidx/m2repository/androidx/savedstate/savedstate-ktx/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/savedstate/savedstate-ktx/1.3.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.savedstate_savedstate-ktx-nodeps", - aars: ["savedstate-ktx-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.savedstate_savedstate", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.savedstate_savedstate-ktx", + aars: ["savedstate-ktx-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.savedstate_savedstate-ktx-nodeps", "androidx.savedstate_savedstate", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/savedstate/savedstate/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/savedstate/savedstate/1.3.0-alpha01/Android.bp index 58d9da993..7b7814c09 100644 --- a/current/androidx/m2repository/androidx/savedstate/savedstate/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/savedstate/savedstate/1.3.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.savedstate_savedstate-nodeps", - aars: ["savedstate-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.arch.core_core-common", - "androidx.lifecycle_lifecycle-common", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.savedstate_savedstate", + aars: ["savedstate-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.savedstate_savedstate-nodeps", "androidx.annotation_annotation", "androidx.arch.core_core-common", "androidx.lifecycle_lifecycle-common", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/slice/slice-builders/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/slice/slice-builders/1.1.0-alpha02/Android.bp index 13417b931..ec539905d 100644 --- a/current/androidx/m2repository/androidx/slice/slice-builders/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/slice/slice-builders/1.1.0-alpha02/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.slice_slice-builders-nodeps", - aars: ["slice-builders-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.remotecallback_remotecallback", - "androidx.slice_slice-core", - ], -} - -android_library { name: "androidx.slice_slice-builders", + aars: ["slice-builders-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.slice_slice-builders-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.remotecallback_remotecallback", "androidx.slice_slice-core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/slice/slice-core/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/slice/slice-core/1.1.0-alpha02/Android.bp index a4b81d770..589fe0dd3 100644 --- a/current/androidx/m2repository/androidx/slice/slice-core/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/slice/slice-core/1.1.0-alpha02/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.slice_slice-core-nodeps", - aars: ["slice-core-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.appcompat_appcompat", - "androidx.collection_collection", - ], -} - -android_library { name: "androidx.slice_slice-core", + aars: ["slice-core-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.slice_slice-core-nodeps", "androidx.annotation_annotation", "androidx.appcompat_appcompat", "androidx.collection_collection", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/slice/slice-view/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/slice/slice-view/1.1.0-alpha02/Android.bp index a23ac7922..b25789a6c 100644 --- a/current/androidx/m2repository/androidx/slice/slice-view/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/slice/slice-view/1.1.0-alpha02/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.slice_slice-view-nodeps", - aars: ["slice-view-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.appcompat_appcompat", - "androidx.collection_collection", - "androidx.lifecycle_lifecycle-livedata-core", - "androidx.recyclerview_recyclerview", - "androidx.slice_slice-core", - ], -} - -android_library { name: "androidx.slice_slice-view", + aars: ["slice-view-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.slice_slice-view-nodeps", "androidx.appcompat_appcompat", "androidx.collection_collection", "androidx.lifecycle_lifecycle-livedata-core", "androidx.recyclerview_recyclerview", "androidx.slice_slice-core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/slidingpanelayout/slidingpanelayout/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/slidingpanelayout/slidingpanelayout/1.3.0-alpha01/Android.bp index 5e3c985b3..460fd7af9 100644 --- a/current/androidx/m2repository/androidx/slidingpanelayout/slidingpanelayout/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/slidingpanelayout/slidingpanelayout/1.3.0-alpha01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.slidingpanelayout_slidingpanelayout-nodeps", - aars: ["slidingpanelayout-1.3.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.customview_customview", - "androidx.transition_transition", - "androidx.window_window", - ], -} - -android_library { name: "androidx.slidingpanelayout_slidingpanelayout", + aars: ["slidingpanelayout-1.3.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.slidingpanelayout_slidingpanelayout-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.customview_customview", "androidx.transition_transition", "androidx.window_window", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/sqlite/sqlite-android/2.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/sqlite/sqlite-android/2.5.0-alpha01/Android.bp index c57771917..09e0dbf8d 100644 --- a/current/androidx/m2repository/androidx/sqlite/sqlite-android/2.5.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/sqlite/sqlite-android/2.5.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.sqlite_sqlite-nodeps", - aars: ["sqlite-android-2.5.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.sqlite_sqlite", + aars: ["sqlite-android-2.5.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.sqlite_sqlite-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/sqlite/sqlite-framework-android/2.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/sqlite/sqlite-framework-android/2.5.0-alpha01/Android.bp index f7b17b838..4fa337856 100644 --- a/current/androidx/m2repository/androidx/sqlite/sqlite-framework-android/2.5.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/sqlite/sqlite-framework-android/2.5.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.sqlite_sqlite-framework-nodeps", - aars: ["sqlite-framework-android-2.5.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.sqlite_sqlite", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.sqlite_sqlite-framework", + aars: ["sqlite-framework-android-2.5.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.sqlite_sqlite-framework-nodeps", "androidx.annotation_annotation", "androidx.sqlite_sqlite", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/startup/startup-runtime/1.2.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/startup/startup-runtime/1.2.0-alpha02/Android.bp index e8aec9add..2471a0ceb 100644 --- a/current/androidx/m2repository/androidx/startup/startup-runtime/1.2.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/startup/startup-runtime/1.2.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.startup_startup-runtime-nodeps", - aars: ["startup-runtime-1.2.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.tracing_tracing", - ], -} - -android_library { name: "androidx.startup_startup-runtime", + aars: ["startup-runtime-1.2.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.startup_startup-runtime-nodeps", "androidx.annotation_annotation", "androidx.tracing_tracing", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/swiperefreshlayout/swiperefreshlayout/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/swiperefreshlayout/swiperefreshlayout/1.2.0-alpha01/Android.bp index c26434fc9..00fc7e8e7 100644 --- a/current/androidx/m2repository/androidx/swiperefreshlayout/swiperefreshlayout/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/swiperefreshlayout/swiperefreshlayout/1.2.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.swiperefreshlayout_swiperefreshlayout-nodeps", - aars: ["swiperefreshlayout-1.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.interpolator_interpolator", - ], -} - -android_library { name: "androidx.swiperefreshlayout_swiperefreshlayout", + aars: ["swiperefreshlayout-1.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.swiperefreshlayout_swiperefreshlayout-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.interpolator_interpolator", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/test/uiautomator/uiautomator/2.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/test/uiautomator/uiautomator/2.4.0-alpha01/Android.bp index c559de5e2..8419ed5e5 100644 --- a/current/androidx/m2repository/androidx/test/uiautomator/uiautomator/2.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/test/uiautomator/uiautomator/2.4.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.test.uiautomator_uiautomator-nodeps", - aars: ["uiautomator-2.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.tracing_tracing", - "junit", - ], -} - -android_library { name: "androidx.test.uiautomator_uiautomator", + aars: ["uiautomator-2.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.test.uiautomator_uiautomator-nodeps", "androidx.annotation_annotation", "androidx.tracing_tracing", "junit", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/textclassifier/textclassifier/1.0.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/textclassifier/textclassifier/1.0.0-alpha03/Android.bp index ff40b4bc0..8668a8a37 100644 --- a/current/androidx/m2repository/androidx/textclassifier/textclassifier/1.0.0-alpha03/Android.bp +++ b/current/androidx/m2repository/androidx/textclassifier/textclassifier/1.0.0-alpha03/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.textclassifier_textclassifier-nodeps", - aars: ["textclassifier-1.0.0-alpha03.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.appcompat_appcompat", - "androidx.collection_collection", - "androidx.core_core", - ], -} - -android_library { name: "androidx.textclassifier_textclassifier", + aars: ["textclassifier-1.0.0-alpha03.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.textclassifier_textclassifier-nodeps", "androidx.annotation_annotation", "androidx.appcompat_appcompat", "androidx.collection_collection", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/tracing/tracing-ktx/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing-ktx/1.3.0-alpha02/Android.bp index c98051d7c..1140e4f98 100644 --- a/current/androidx/m2repository/androidx/tracing/tracing-ktx/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/tracing/tracing-ktx/1.3.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.tracing_tracing-ktx-nodeps", - aars: ["tracing-ktx-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.tracing_tracing", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.tracing_tracing-ktx", + aars: ["tracing-ktx-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.tracing_tracing-ktx-nodeps", "androidx.tracing_tracing", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/tracing/tracing-perfetto-binary/1.0.0/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing-perfetto-binary/1.0.0/Android.bp index eb03dc2bb..d8fb70aa1 100644 --- a/current/androidx/m2repository/androidx/tracing/tracing-perfetto-binary/1.0.0/Android.bp +++ b/current/androidx/m2repository/androidx/tracing/tracing-perfetto-binary/1.0.0/Android.bp @@ -15,30 +15,14 @@ package { } android_library_import { - name: "androidx.tracing_tracing-perfetto-binary-nodeps", - aars: ["tracing-perfetto-binary-1.0.0.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - ], -} - -android_library { name: "androidx.tracing_tracing-perfetto-binary", + aars: ["tracing-perfetto-binary-1.0.0.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.tracing_tracing-perfetto-binary-nodeps", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/tracing/tracing-perfetto-handshake/1.0.0/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing-perfetto-handshake/1.0.0/Android.bp index 559f19e7e..2876e5954 100644 --- a/current/androidx/m2repository/androidx/tracing/tracing-perfetto-handshake/1.0.0/Android.bp +++ b/current/androidx/m2repository/androidx/tracing/tracing-perfetto-handshake/1.0.0/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.tracing_tracing-perfetto-handshake-nodeps", - jars: ["tracing-perfetto-handshake-1.0.0.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.tracing_tracing-perfetto-handshake", + jars: ["tracing-perfetto-handshake-1.0.0.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,9 +24,6 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.tracing_tracing-perfetto-handshake-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/tracing/tracing-perfetto/1.0.0/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing-perfetto/1.0.0/Android.bp index 62965168c..2bf5def58 100644 --- a/current/androidx/m2repository/androidx/tracing/tracing-perfetto/1.0.0/Android.bp +++ b/current/androidx/m2repository/androidx/tracing/tracing-perfetto/1.0.0/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.tracing_tracing-perfetto-nodeps", - aars: ["tracing-perfetto-1.0.0.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.startup_startup-runtime", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.tracing_tracing-perfetto", + aars: ["tracing-perfetto-1.0.0.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.tracing_tracing-perfetto-nodeps", "androidx.annotation_annotation", "androidx.startup_startup-runtime", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/tracing/tracing/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing/1.3.0-alpha02/Android.bp index 07ac16d65..ee1bb96d1 100644 --- a/current/androidx/m2repository/androidx/tracing/tracing/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/tracing/tracing/1.3.0-alpha02/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.tracing_tracing-nodeps", - aars: ["tracing-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - ], -} - -android_library { name: "androidx.tracing_tracing", + aars: ["tracing-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.tracing_tracing-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/transition/transition-ktx/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/transition/transition-ktx/1.5.0-alpha01/Android.bp index d91b69f52..8d6627432 100644 --- a/current/androidx/m2repository/androidx/transition/transition-ktx/1.5.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/transition/transition-ktx/1.5.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.transition_transition-ktx-nodeps", - aars: ["transition-ktx-1.5.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.transition_transition", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.transition_transition-ktx", + aars: ["transition-ktx-1.5.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.transition_transition-ktx-nodeps", "androidx.transition_transition", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/transition/transition/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/transition/transition/1.5.0-alpha01/Android.bp index ce0d0e532..e0d3a4fa9 100644 --- a/current/androidx/m2repository/androidx/transition/transition/1.5.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/transition/transition/1.5.0-alpha01/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.transition_transition-nodeps", - aars: ["transition-1.5.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - ], -} - -android_library { name: "androidx.transition_transition", + aars: ["transition-1.5.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.transition_transition-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/tvprovider/tvprovider/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/tvprovider/tvprovider/1.1.0-alpha02/Android.bp index 4c85761fb..9ff01d803 100644 --- a/current/androidx/m2repository/androidx/tvprovider/tvprovider/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/tvprovider/tvprovider/1.1.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.tvprovider_tvprovider-nodeps", - aars: ["tvprovider-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "21", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - ], -} - -android_library { name: "androidx.tvprovider_tvprovider", + aars: ["tvprovider-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "21", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.tvprovider_tvprovider-nodeps", "androidx.annotation_annotation", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/vectordrawable/vectordrawable-animated/1.2.0-beta01/Android.bp b/current/androidx/m2repository/androidx/vectordrawable/vectordrawable-animated/1.2.0-beta01/Android.bp index 6588dd0c0..b4df0e781 100644 --- a/current/androidx/m2repository/androidx/vectordrawable/vectordrawable-animated/1.2.0-beta01/Android.bp +++ b/current/androidx/m2repository/androidx/vectordrawable/vectordrawable-animated/1.2.0-beta01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.vectordrawable_vectordrawable-animated-nodeps", - aars: ["vectordrawable-animated-1.2.0-beta01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.interpolator_interpolator", - "androidx.vectordrawable_vectordrawable", - ], -} - -android_library { name: "androidx.vectordrawable_vectordrawable-animated", + aars: ["vectordrawable-animated-1.2.0-beta01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.vectordrawable_vectordrawable-animated-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.interpolator_interpolator", "androidx.vectordrawable_vectordrawable", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/vectordrawable/vectordrawable/1.2.0-beta02/Android.bp b/current/androidx/m2repository/androidx/vectordrawable/vectordrawable/1.2.0-beta02/Android.bp index 3cf46a648..222881bb5 100644 --- a/current/androidx/m2repository/androidx/vectordrawable/vectordrawable/1.2.0-beta02/Android.bp +++ b/current/androidx/m2repository/androidx/vectordrawable/vectordrawable/1.2.0-beta02/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.vectordrawable_vectordrawable-nodeps", - aars: ["vectordrawable-1.2.0-beta02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - ], -} - -android_library { name: "androidx.vectordrawable_vectordrawable", + aars: ["vectordrawable-1.2.0-beta02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.vectordrawable_vectordrawable-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/versionedparcelable/versionedparcelable/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/versionedparcelable/versionedparcelable/1.2.0-alpha01/Android.bp index a953ceafe..8239d5195 100644 --- a/current/androidx/m2repository/androidx/versionedparcelable/versionedparcelable/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/versionedparcelable/versionedparcelable/1.2.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.versionedparcelable_versionedparcelable-nodeps", - aars: ["versionedparcelable-1.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - ], -} - -android_library { name: "androidx.versionedparcelable_versionedparcelable", + aars: ["versionedparcelable-1.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.versionedparcelable_versionedparcelable-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/viewpager/viewpager/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/viewpager/viewpager/1.1.0-alpha02/Android.bp index 82ee57131..c44a28bc8 100644 --- a/current/androidx/m2repository/androidx/viewpager/viewpager/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/viewpager/viewpager/1.1.0-alpha02/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.viewpager_viewpager-nodeps", - aars: ["viewpager-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.customview_customview", - ], -} - -android_library { name: "androidx.viewpager_viewpager", + aars: ["viewpager-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.viewpager_viewpager-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.customview_customview", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/viewpager2/viewpager2/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/viewpager2/viewpager2/1.2.0-alpha01/Android.bp index b4a1961b6..d980d0a7b 100644 --- a/current/androidx/m2repository/androidx/viewpager2/viewpager2/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/viewpager2/viewpager2/1.2.0-alpha01/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.viewpager2_viewpager2-nodeps", - aars: ["viewpager2-1.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.fragment_fragment", - "androidx.recyclerview_recyclerview", - ], -} - -android_library { name: "androidx.viewpager2_viewpager2", + aars: ["viewpager2-1.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.viewpager2_viewpager2-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", "androidx.fragment_fragment", "androidx.recyclerview_recyclerview", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/compose/compose-foundation/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/wear/compose/compose-foundation/1.4.0-alpha05/Android.bp index 9beda8b56..c255ffd4e 100644 --- a/current/androidx/m2repository/androidx/wear/compose/compose-foundation/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/wear/compose/compose-foundation/1.4.0-alpha05/Android.bp @@ -15,7 +15,7 @@ package { } android_library_import { - name: "androidx.wear.compose_compose-foundation-nodeps", + name: "androidx.wear.compose_compose-foundation", aars: ["compose-foundation-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ @@ -35,30 +35,7 @@ android_library_import { "androidx.profileinstaller_profileinstaller", "kotlin-stdlib", ], -} - -android_library { - name: "androidx.wear.compose_compose-foundation", - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "25", - manifest: "manifest/AndroidManifest.xml", - static_libs: [ - "androidx.wear.compose_compose-foundation-nodeps", - "androidx.compose.foundation_foundation", - "androidx.compose.foundation_foundation-layout", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-text", - "androidx.compose.ui_ui-util", - "androidx.core_core", - "androidx.lifecycle_lifecycle-runtime-compose", - "androidx.profileinstaller_profileinstaller", - "kotlin-stdlib", + optional_uses_libs: [ + "wear-sdk", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/compose/compose-material-core/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/wear/compose/compose-material-core/1.4.0-alpha05/Android.bp index 8d5cce9bb..f7df25951 100644 --- a/current/androidx/m2repository/androidx/wear/compose/compose-material-core/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/wear/compose/compose-material-core/1.4.0-alpha05/Android.bp @@ -15,40 +15,15 @@ package { } android_library_import { - name: "androidx.wear.compose_compose-material-core-nodeps", - aars: ["compose-material-core-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "25", - static_libs: [ - "androidx.compose.animation_animation", - "androidx.compose.foundation_foundation", - "androidx.compose.material_material-icons-core", - "androidx.compose.material_material-ripple", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-text", - "androidx.compose.ui_ui-util", - "androidx.profileinstaller_profileinstaller", - "androidx.wear.compose_compose-foundation", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.wear.compose_compose-material-core", + aars: ["compose-material-core-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "25", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.compose_compose-material-core-nodeps", "androidx.compose.animation_animation", "androidx.compose.foundation_foundation", "androidx.compose.material_material-icons-core", @@ -61,6 +36,4 @@ android_library { "androidx.wear.compose_compose-foundation", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/compose/compose-material/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/wear/compose/compose-material/1.4.0-alpha05/Android.bp index ce4d702eb..a3dfd4187 100644 --- a/current/androidx/m2repository/androidx/wear/compose/compose-material/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/wear/compose/compose-material/1.4.0-alpha05/Android.bp @@ -15,42 +15,15 @@ package { } android_library_import { - name: "androidx.wear.compose_compose-material-nodeps", - aars: ["compose-material-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "25", - static_libs: [ - "androidx.compose.animation_animation", - "androidx.compose.foundation_foundation", - "androidx.compose.material_material-icons-core", - "androidx.compose.material_material-ripple", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.compose.ui_ui-text", - "androidx.compose.ui_ui-util", - "androidx.lifecycle_lifecycle-common", - "androidx.profileinstaller_profileinstaller", - "androidx.wear.compose_compose-foundation", - "androidx.wear.compose_compose-material-core", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.wear.compose_compose-material", + aars: ["compose-material-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "25", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.compose_compose-material-nodeps", "androidx.compose.animation_animation", "androidx.compose.foundation_foundation", "androidx.compose.material_material-icons-core", @@ -65,6 +38,4 @@ android_library { "androidx.wear.compose_compose-material-core", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/compose/compose-navigation/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/wear/compose/compose-navigation/1.4.0-alpha05/Android.bp index 2d9ad204f..2ee69a25d 100644 --- a/current/androidx/m2repository/androidx/wear/compose/compose-navigation/1.4.0-alpha05/Android.bp +++ b/current/androidx/m2repository/androidx/wear/compose/compose-navigation/1.4.0-alpha05/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.wear.compose_compose-navigation-nodeps", - aars: ["compose-navigation-1.4.0-alpha05.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "25", - static_libs: [ - "androidx.activity_activity-compose", - "androidx.compose.runtime_runtime", - "androidx.compose.ui_ui", - "androidx.lifecycle_lifecycle-viewmodel-compose", - "androidx.navigation_navigation-common", - "androidx.navigation_navigation-compose", - "androidx.navigation_navigation-runtime", - "androidx.profileinstaller_profileinstaller", - "androidx.wear.compose_compose-material", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.wear.compose_compose-navigation", + aars: ["compose-navigation-1.4.0-alpha05.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "25", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.compose_compose-navigation-nodeps", "androidx.activity_activity-compose", "androidx.compose.runtime_runtime", "androidx.compose.ui_ui", @@ -59,6 +35,4 @@ android_library { "androidx.wear.compose_compose-material", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression-pipeline/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression-pipeline/1.2.0-alpha01/Android.bp index f6152433e..99b2ff43a 100644 --- a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression-pipeline/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression-pipeline/1.2.0-alpha01/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.wear.protolayout_protolayout-expression-pipeline-nodeps", - aars: ["protolayout-expression-pipeline-1.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.concurrent_concurrent-futures", - "androidx.core_core", - "androidx.wear.protolayout_protolayout-expression", - "androidx.wear.protolayout_protolayout-proto", - ], -} - -android_library { name: "androidx.wear.protolayout_protolayout-expression-pipeline", + aars: ["protolayout-expression-pipeline-1.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.protolayout_protolayout-expression-pipeline-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", @@ -53,6 +32,4 @@ android_library { "androidx.wear.protolayout_protolayout-expression", "androidx.wear.protolayout_protolayout-proto", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression/1.2.0-alpha01/Android.bp index 0911c2b49..0343b70d3 100644 --- a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression/1.2.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.wear.protolayout_protolayout-expression-nodeps", - aars: ["protolayout-expression-1.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.collection_collection", - "androidx.wear.protolayout_protolayout-proto", - ], -} - -android_library { name: "androidx.wear.protolayout_protolayout-expression", + aars: ["protolayout-expression-1.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.protolayout_protolayout-expression-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.collection_collection", "androidx.wear.protolayout_protolayout-proto", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-proto/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-proto/1.2.0-alpha01/Android.bp index 302ebd6f1..ee877ed62 100644 --- a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-proto/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-proto/1.2.0-alpha01/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.wear.protolayout_protolayout-proto-nodeps", - jars: ["protolayout-proto-1.2.0-alpha01.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.wear.protolayout_protolayout-proto", + jars: ["protolayout-proto-1.2.0-alpha01.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,9 +24,6 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.wear.protolayout_protolayout-proto-nodeps", "androidx.annotation_annotation", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/protolayout/protolayout/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/protolayout/protolayout/1.2.0-alpha01/Android.bp index afed1711f..62eb4a29c 100644 --- a/current/androidx/m2repository/androidx/wear/protolayout/protolayout/1.2.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/wear/protolayout/protolayout/1.2.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.wear.protolayout_protolayout-nodeps", - aars: ["protolayout-1.2.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.wear.protolayout_protolayout-expression", - "androidx.wear.protolayout_protolayout-proto", - ], -} - -android_library { name: "androidx.wear.protolayout_protolayout", + aars: ["protolayout-1.2.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.protolayout_protolayout-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.wear.protolayout_protolayout-expression", "androidx.wear.protolayout_protolayout-proto", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/tiles/tiles-proto/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/tiles/tiles-proto/1.4.0-alpha01/Android.bp index 8a5219b51..c45dda810 100644 --- a/current/androidx/m2repository/androidx/wear/tiles/tiles-proto/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/wear/tiles/tiles-proto/1.4.0-alpha01/Android.bp @@ -15,18 +15,8 @@ package { } java_import { - name: "androidx.wear.tiles_tiles-proto-nodeps", - jars: ["tiles-proto-1.4.0-alpha01.jar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "24", -} - -java_library_static { name: "androidx.wear.tiles_tiles-proto", + jars: ["tiles-proto-1.4.0-alpha01.jar"], sdk_version: "34", apex_available: [ "//apex_available:platform", @@ -34,10 +24,7 @@ java_library_static { ], min_sdk_version: "24", static_libs: [ - "androidx.wear.tiles_tiles-proto-nodeps", "androidx.annotation_annotation", "androidx.wear.protolayout_protolayout-proto", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/tiles/tiles/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/tiles/tiles/1.4.0-alpha01/Android.bp index 57af8c664..8d885b7a7 100644 --- a/current/androidx/m2repository/androidx/wear/tiles/tiles/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/wear/tiles/tiles/1.4.0-alpha01/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.wear.tiles_tiles-nodeps", - aars: ["tiles-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.concurrent_concurrent-futures", - "androidx.wear.protolayout_protolayout", - "androidx.wear.protolayout_protolayout-expression", - "androidx.wear.tiles_tiles-proto", - "guava-listenablefuture-prebuilt-jar", - ], -} - -android_library { name: "androidx.wear.tiles_tiles", + aars: ["tiles-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.tiles_tiles-nodeps", "androidx.annotation_annotation", "androidx.annotation_annotation-experimental", "androidx.concurrent_concurrent-futures", @@ -53,6 +32,4 @@ android_library { "androidx.wear.tiles_tiles-proto", "guava-listenablefuture-prebuilt-jar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-client-guava/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-client-guava/1.3.0-alpha02/Android.bp index 63a11b910..3601bc5d0 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-client-guava/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-client-guava/1.3.0-alpha02/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-client-guava-nodeps", - aars: ["watchface-client-guava-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.concurrent_concurrent-futures", - "androidx.wear.watchface_watchface-client", - "kotlinx_coroutines_guava", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-client-guava", + aars: ["watchface-client-guava-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-client-guava-nodeps", "androidx.concurrent_concurrent-futures", "androidx.wear.watchface_watchface-client", "kotlinx_coroutines_guava", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-client/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-client/1.3.0-alpha02/Android.bp index 9f08a87fc..e6d42758d 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-client/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-client/1.3.0-alpha02/Android.bp @@ -15,36 +15,15 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-client-nodeps", - aars: ["watchface-client-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.wear.watchface_watchface", - "androidx.wear.watchface_watchface-complications-data", - "androidx.wear.watchface_watchface-data", - "androidx.wear.watchface_watchface-style", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-client", + aars: ["watchface-client-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-client-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.wear.watchface_watchface", @@ -53,6 +32,4 @@ android_library { "androidx.wear.watchface_watchface-style", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data-source/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data-source/1.3.0-alpha02/Android.bp index b09806362..80fffbe5f 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data-source/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data-source/1.3.0-alpha02/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-complications-data-source-nodeps", - aars: ["watchface-complications-data-source-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.preference_preference", - "androidx.wear.watchface_watchface-complications", - "androidx.wear.watchface_watchface-complications-data", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-complications-data-source", + aars: ["watchface-complications-data-source-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-complications-data-source-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.preference_preference", "androidx.wear.watchface_watchface-complications", "androidx.wear.watchface_watchface-complications-data", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data/1.3.0-alpha02/Android.bp index 5c7cb4ecb..f4c50e2c5 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data/1.3.0-alpha02/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-complications-data-nodeps", - aars: ["watchface-complications-data-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.preference_preference", - "androidx.versionedparcelable_versionedparcelable", - "androidx.wear.protolayout_protolayout-expression", - "androidx.wear.protolayout_protolayout-expression-pipeline", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-complications-data", + aars: ["watchface-complications-data-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-complications-data-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.preference_preference", @@ -55,6 +33,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications/1.3.0-alpha02/Android.bp index 797fd3ee9..d76b81480 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications/1.3.0-alpha02/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-complications-nodeps", - aars: ["watchface-complications-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.wear.watchface_watchface-complications-data", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-complications", + aars: ["watchface-complications-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-complications-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.wear.watchface_watchface-complications-data", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-data/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-data/1.3.0-alpha02/Android.bp index ce342f824..1f17dcba8 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-data/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-data/1.3.0-alpha02/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-data-nodeps", - aars: ["watchface-data-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.versionedparcelable_versionedparcelable", - "androidx.wear.watchface_watchface-complications-data", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-data", + aars: ["watchface-data-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-data-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.versionedparcelable_versionedparcelable", "androidx.wear.watchface_watchface-complications-data", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-editor-guava/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-editor-guava/1.3.0-alpha02/Android.bp index 56bce9307..b4f7b5602 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-editor-guava/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-editor-guava/1.3.0-alpha02/Android.bp @@ -15,36 +15,17 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-editor-guava-nodeps", - aars: ["watchface-editor-guava-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.concurrent_concurrent-futures", - "androidx.wear.watchface_watchface-editor", - "kotlinx_coroutines_guava", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-editor-guava", + aars: ["watchface-editor-guava-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-editor-guava-nodeps", "androidx.concurrent_concurrent-futures", "androidx.wear.watchface_watchface-editor", "kotlinx_coroutines_guava", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-editor/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-editor/1.3.0-alpha02/Android.bp index eb860c0a2..814da9e83 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-editor/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-editor/1.3.0-alpha02/Android.bp @@ -15,39 +15,15 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-editor-nodeps", - aars: ["watchface-editor-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.activity_activity", - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.lifecycle_lifecycle-common-java8", - "androidx.lifecycle_lifecycle-runtime-ktx", - "androidx.versionedparcelable_versionedparcelable", - "androidx.wear.watchface_watchface-client", - "androidx.wear.watchface_watchface-data", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-editor", + aars: ["watchface-editor-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-editor-nodeps", "androidx.activity_activity", "androidx.annotation_annotation", "androidx.core_core", @@ -59,6 +35,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-guava/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-guava/1.3.0-alpha02/Android.bp index e451d78bc..5c733ed2c 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-guava/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-guava/1.3.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-guava-nodeps", - aars: ["watchface-guava-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.wear.watchface_watchface", - "guava", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-guava", + aars: ["watchface-guava-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-guava-nodeps", "androidx.wear.watchface_watchface", "guava", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-style/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-style/1.3.0-alpha02/Android.bp index 99f05169d..04e6c4d6e 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface-style/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-style/1.3.0-alpha02/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-style-nodeps", - aars: ["watchface-style-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.preference_preference", - "androidx.wear.watchface_watchface-complications", - "androidx.wear.watchface_watchface-data", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.wear.watchface_watchface-style", + aars: ["watchface-style-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-style-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.preference_preference", @@ -51,6 +31,4 @@ android_library { "androidx.wear.watchface_watchface-data", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface/1.3.0-alpha02/Android.bp index 61f6abe29..0778c8f08 100644 --- a/current/androidx/m2repository/androidx/wear/watchface/watchface/1.3.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/watchface/watchface/1.3.0-alpha02/Android.bp @@ -15,37 +15,15 @@ package { } android_library_import { - name: "androidx.wear.watchface_watchface-nodeps", - aars: ["watchface-1.3.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "26", - static_libs: [ - "androidx.activity_activity", - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.wear.watchface_watchface-complications-data", - "androidx.wear.watchface_watchface-data", - "androidx.wear.watchface_watchface-style", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.wear.watchface_watchface", + aars: ["watchface-1.3.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "26", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear.watchface_watchface-nodeps", "androidx.activity_activity", "androidx.annotation_annotation", "androidx.core_core", @@ -55,6 +33,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/wear-ongoing/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/wear-ongoing/1.1.0-alpha02/Android.bp index 1e9676009..1c4b347cf 100644 --- a/current/androidx/m2repository/androidx/wear/wear-ongoing/1.1.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/wear/wear-ongoing/1.1.0-alpha02/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.wear_wear-ongoing-nodeps", - aars: ["wear-ongoing-1.1.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "25", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.core_core-ktx", - "androidx.versionedparcelable_versionedparcelable", - ], -} - -android_library { name: "androidx.wear_wear-ongoing", + aars: ["wear-ongoing-1.1.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "25", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear_wear-ongoing-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.core_core-ktx", "androidx.versionedparcelable_versionedparcelable", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/wear-phone-interactions/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/wear/wear-phone-interactions/1.1.0-alpha04/Android.bp index 81a54092e..ead2314a5 100644 --- a/current/androidx/m2repository/androidx/wear/wear-phone-interactions/1.1.0-alpha04/Android.bp +++ b/current/androidx/m2repository/androidx/wear/wear-phone-interactions/1.1.0-alpha04/Android.bp @@ -15,40 +15,19 @@ package { } android_library_import { - name: "androidx.wear_wear-phone-interactions-nodeps", - aars: ["wear-phone-interactions-1.1.0-alpha04.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "25", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.wear_wear", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.wear_wear-phone-interactions", + aars: ["wear-phone-interactions-1.1.0-alpha04.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "25", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear_wear-phone-interactions-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.wear_wear", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/wear/wear/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/wear/1.4.0-alpha01/Android.bp index 73f8a8bd8..c62a760e0 100644 --- a/current/androidx/m2repository/androidx/wear/wear/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/wear/wear/1.4.0-alpha01/Android.bp @@ -15,38 +15,15 @@ package { } android_library_import { - name: "androidx.wear_wear-nodeps", - aars: ["wear-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "23", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.core_core-ktx", - "androidx.dynamicanimation_dynamicanimation", - "androidx.fragment_fragment", - "androidx.lifecycle_lifecycle-runtime", - "androidx.recyclerview_recyclerview", - "androidx.swiperefreshlayout_swiperefreshlayout", - "androidx.versionedparcelable_versionedparcelable", - ], -} - -android_library { name: "androidx.wear_wear", + aars: ["wear-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "23", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.wear_wear-nodeps", "androidx.annotation_annotation", "androidx.core_core", "androidx.core_core-ktx", @@ -57,6 +34,4 @@ android_library { "androidx.swiperefreshlayout_swiperefreshlayout", "androidx.versionedparcelable_versionedparcelable", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/webkit/webkit/1.7.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/webkit/webkit/1.7.0-alpha02/Android.bp index a15ac5359..515a52e61 100644 --- a/current/androidx/m2repository/androidx/webkit/webkit/1.7.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/webkit/webkit/1.7.0-alpha02/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.webkit_webkit-nodeps", - aars: ["webkit-1.7.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - ], -} - -android_library { name: "androidx.webkit_webkit", + aars: ["webkit-1.7.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.webkit_webkit-nodeps", "androidx.annotation_annotation", "androidx.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/window/extensions/core/core/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/extensions/core/core/1.1.0-alpha01/Android.bp index 25d375be4..a988ad52a 100644 --- a/current/androidx/m2repository/androidx/window/extensions/core/core/1.1.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/window/extensions/core/core/1.1.0-alpha01/Android.bp @@ -43,6 +43,4 @@ android_library { "androidx.annotation_annotation", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/window/extensions/extensions/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/extensions/extensions/1.3.0-alpha01/Android.bp index bb464c8d4..a296f956a 100644 --- a/current/androidx/m2repository/androidx/window/extensions/extensions/1.3.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/window/extensions/extensions/1.3.0-alpha01/Android.bp @@ -45,6 +45,4 @@ android_library { "androidx.annotation_annotation-experimental", "androidx.window.extensions.core_core", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/window/window-core-android/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/window-core-android/1.4.0-alpha01/Android.bp index 13360565d..598c79307 100644 --- a/current/androidx/m2repository/androidx/window/window-core-android/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/window/window-core-android/1.4.0-alpha01/Android.bp @@ -15,34 +15,16 @@ package { } android_library_import { - name: "androidx.window_window-core-nodeps", - aars: ["window-core-android-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "kotlin-stdlib", - ], -} - -android_library { name: "androidx.window_window-core", + aars: ["window-core-android-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.window_window-core-nodeps", "androidx.annotation_annotation", "kotlin-stdlib", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/window/window-java/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/window-java/1.4.0-alpha01/Android.bp index 835a6d7b9..5324de9ab 100644 --- a/current/androidx/m2repository/androidx/window/window-java/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/window/window-java/1.4.0-alpha01/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.window_window-java-nodeps", - aars: ["window-java-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.core_core", - "androidx.window_window", - "kotlin-stdlib", - "kotlinx_coroutines", - ], -} - -android_library { name: "androidx.window_window-java", + aars: ["window-java-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.window_window-java-nodeps", "androidx.core_core", "androidx.window_window", "kotlin-stdlib", "kotlinx_coroutines", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/window/window/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/window/1.4.0-alpha01/Android.bp index 45e52d569..de1efcf22 100644 --- a/current/androidx/m2repository/androidx/window/window/1.4.0-alpha01/Android.bp +++ b/current/androidx/m2repository/androidx/window/window/1.4.0-alpha01/Android.bp @@ -15,35 +15,15 @@ package { } android_library_import { - name: "androidx.window_window-nodeps", - aars: ["window-1.4.0-alpha01.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation", - "androidx.collection_collection", - "androidx.core_core", - "androidx.window.extensions.core_core", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.window_window", + aars: ["window-1.4.0-alpha01.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.window_window-nodeps", "androidx.annotation_annotation", "androidx.collection_collection", "androidx.core_core", @@ -55,6 +35,4 @@ android_library { "androidx.window.extensions", "androidx.window.sidecar", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/work/work-runtime-ktx/2.10.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/work/work-runtime-ktx/2.10.0-alpha02/Android.bp index de477dc82..ca173bf1d 100644 --- a/current/androidx/m2repository/androidx/work/work-runtime-ktx/2.10.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/work/work-runtime-ktx/2.10.0-alpha02/Android.bp @@ -15,32 +15,15 @@ package { } android_library_import { - name: "androidx.work_work-runtime-ktx-nodeps", - aars: ["work-runtime-ktx-2.10.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.work_work-runtime", - ], -} - -android_library { name: "androidx.work_work-runtime-ktx", + aars: ["work-runtime-ktx-2.10.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.work_work-runtime-ktx-nodeps", "androidx.work_work-runtime", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/work/work-runtime/2.10.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/work/work-runtime/2.10.0-alpha02/Android.bp index 9228b2d6e..12d51b5a8 100644 --- a/current/androidx/m2repository/androidx/work/work-runtime/2.10.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/work/work-runtime/2.10.0-alpha02/Android.bp @@ -15,40 +15,15 @@ package { } android_library_import { - name: "androidx.work_work-runtime-nodeps", - aars: ["work-runtime-2.10.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.annotation_annotation-experimental", - "androidx.concurrent_concurrent-futures-ktx", - "androidx.core_core", - "androidx.lifecycle_lifecycle-livedata", - "androidx.lifecycle_lifecycle-service", - "androidx.room_room-ktx", - "androidx.startup_startup-runtime", - "androidx.tracing_tracing-ktx", - "guava-listenablefuture-prebuilt-jar", - "kotlin-stdlib", - "kotlinx_coroutines_android", - ], -} - -android_library { name: "androidx.work_work-runtime", + aars: ["work-runtime-2.10.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.work_work-runtime-nodeps", "androidx.annotation_annotation-experimental", "androidx.concurrent_concurrent-futures-ktx", "androidx.core_core", @@ -61,6 +36,4 @@ android_library { "kotlin-stdlib", "kotlinx_coroutines_android", ], - java_version: "1.7", } - diff --git a/current/androidx/m2repository/androidx/work/work-testing/2.10.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/work/work-testing/2.10.0-alpha02/Android.bp index c7e002248..774d7a42a 100644 --- a/current/androidx/m2repository/androidx/work/work-testing/2.10.0-alpha02/Android.bp +++ b/current/androidx/m2repository/androidx/work/work-testing/2.10.0-alpha02/Android.bp @@ -15,38 +15,18 @@ package { } android_library_import { - name: "androidx.work_work-testing-nodeps", - aars: ["work-testing-2.10.0-alpha02.aar"], - sdk_version: "34", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - min_sdk_version: "19", - static_libs: [ - "androidx.concurrent_concurrent-futures-ktx", - "androidx.lifecycle_lifecycle-livedata-core", - "androidx.room_room-runtime", - "androidx.work_work-runtime", - ], -} - -android_library { name: "androidx.work_work-testing", + aars: ["work-testing-2.10.0-alpha02.aar"], sdk_version: "34", apex_available: [ "//apex_available:platform", "//apex_available:anyapex", ], min_sdk_version: "19", - manifest: "manifest/AndroidManifest.xml", static_libs: [ - "androidx.work_work-testing-nodeps", "androidx.concurrent_concurrent-futures-ktx", "androidx.lifecycle_lifecycle-livedata-core", "androidx.room_room-runtime", "androidx.work_work-runtime", ], - java_version: "1.7", } - |