diff --git a/app/Android.bp b/app/Android.bp index fe49271..ad4a179 100644 --- a/app/Android.bp +++ b/app/Android.bp @@ -39,7 +39,7 @@ android_app { "androidx.appcompat_appcompat", "androidx-constraintlayout_constraintlayout", "androidx.preference_preference", - "Glimpse_com.google.android.material_material", + "com.google.android.material_material", "androidx.exifinterface_exifinterface", "Glimpse_androidx.media3_media3-exoplayer", "Glimpse_androidx.media3_media3-exoplayer-dash", diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7889f22..80edee9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -122,6 +122,7 @@ configure { } module.group.startsWith("org.jetbrains") -> true + module.group == "com.google.android.material" -> true module.group == "com.google.auto.value" -> true module.group == "com.google.guava" -> true module.group == "junit" -> true diff --git a/app/libs/Android.bp b/app/libs/Android.bp index 466e305..a61228e 100644 --- a/app/libs/Android.bp +++ b/app/libs/Android.bp @@ -419,66 +419,6 @@ android_library { java_version: "1.7", } -android_library_import { - name: "Glimpse_com.google.android.material_material-nodeps", - aars: ["com/google/android/material/material/1.9.0/material-1.9.0.aar"], - sdk_version: "35", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - static_libs: [ - "Glimpse_com.google.errorprone_error_prone_annotations", - "androidx-constraintlayout_constraintlayout", - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.appcompat_appcompat", - "androidx.cardview_cardview", - "androidx.coordinatorlayout_coordinatorlayout", - "androidx.core_core", - "androidx.drawerlayout_drawerlayout", - "androidx.dynamicanimation_dynamicanimation", - "androidx.fragment_fragment", - "androidx.lifecycle_lifecycle-runtime", - "androidx.recyclerview_recyclerview", - "androidx.transition_transition", - "androidx.vectordrawable_vectordrawable", - "androidx.viewpager2_viewpager2", - ], -} - -android_library { - name: "Glimpse_com.google.android.material_material", - sdk_version: "35", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - manifest: "com/google/android/material/material/1.9.0/AndroidManifest.xml", - static_libs: [ - "Glimpse_com.google.android.material_material-nodeps", - "Glimpse_com.google.errorprone_error_prone_annotations", - "androidx-constraintlayout_constraintlayout", - "androidx.annotation_annotation", - "androidx.annotation_annotation-experimental", - "androidx.appcompat_appcompat", - "androidx.cardview_cardview", - "androidx.coordinatorlayout_coordinatorlayout", - "androidx.core_core", - "androidx.drawerlayout_drawerlayout", - "androidx.dynamicanimation_dynamicanimation", - "androidx.fragment_fragment", - "androidx.lifecycle_lifecycle-runtime", - "androidx.recyclerview_recyclerview", - "androidx.transition_transition", - "androidx.vectordrawable_vectordrawable", - "androidx.viewpager2_viewpager2", - ], - java_version: "1.7", -} - java_import { name: "Glimpse_com.google.errorprone_error_prone_annotations-nodeps", jars: ["com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar"], diff --git a/app/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml b/app/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml deleted file mode 100644 index bff0c00..0000000 --- a/app/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml.license b/app/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml.license deleted file mode 100644 index db465ee..0000000 --- a/app/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2024 The Android Open Source Project - -SPDX-License-Identifier: Apache-2.0 diff --git a/app/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar b/app/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar deleted file mode 100644 index 5778b67..0000000 Binary files a/app/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar and /dev/null differ diff --git a/app/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar.license b/app/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar.license deleted file mode 100644 index db465ee..0000000 --- a/app/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2015-2024 The Android Open Source Project - -SPDX-License-Identifier: Apache-2.0