Aperture: Use AOSP material & lifecycle-common

They're new enough

Change-Id: I4a59c800d99466bfdb453deccf18f1438d6caa5a

app/Android.bp

@@ -37,7 +37,7 @@ android_app {
         "androidx.exifinterface_exifinterface",
         "androidx.lifecycle_lifecycle-viewmodel-ktx",
         "androidx.preference_preference",
-        "Aperture_com.google.android.material_material",
+        "com.google.android.material_material",
         "Aperture_androidx.camera_camera-core",
         "Aperture_androidx.camera_camera-camera2",
         "Aperture_androidx.camera_camera-lifecycle",

app/build.gradle.kts

@@ -124,13 +124,13 @@ configure<GenerateBpPluginExtension> {
     availableInAOSP.set { module: Module ->
         when {
             module.group.startsWith("androidx") -> {
-                // We provide our own androidx.{camera,media3} & lifecycle-common
+                // We provide our own androidx.{camera,media3}
                 !module.group.startsWith("androidx.camera") &&
-                        !module.group.startsWith("androidx.media3") &&
-                        module.name != "lifecycle-common"
+                        !module.group.startsWith("androidx.media3")
             }
 
             module.group.startsWith("org.jetbrains") -> true
+            module.group == "com.google.android.material" -> true
             module.group == "com.google.auto.value" -> true
             module.group == "com.google.errorprone" -> true
             module.group == "com.google.guava" -> true

app/libs/Android.bp

@@ -57,13 +57,13 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Aperture_androidx.lifecycle_lifecycle-common",
         "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",
         "androidx.tracing_tracing",
         "auto_value_annotations",
@@ -85,13 +85,13 @@ android_library {
     manifest: "androidx/camera/camera-core/1.5.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-core-nodeps",
-        "Aperture_androidx.lifecycle_lifecycle-common",
         "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",
         "androidx.tracing_tracing",
         "auto_value_annotations",
@@ -151,10 +151,10 @@ android_library_import {
     ],
     static_libs: [
         "Aperture_androidx.camera_camera-core",
-        "Aperture_androidx.lifecycle_lifecycle-common",
         "androidx.concurrent_concurrent-futures",
         "androidx.concurrent_concurrent-futures-ktx",
         "androidx.core_core",
+        "androidx.lifecycle_lifecycle-common",
         "androidx.tracing_tracing-ktx",
         "auto_value_annotations",
         "guava",
@@ -174,10 +174,10 @@ android_library {
     static_libs: [
         "Aperture_androidx.camera_camera-lifecycle-nodeps",
         "Aperture_androidx.camera_camera-core",
-        "Aperture_androidx.lifecycle_lifecycle-common",
         "androidx.concurrent_concurrent-futures",
         "androidx.concurrent_concurrent-futures-ktx",
         "androidx.core_core",
+        "androidx.lifecycle_lifecycle-common",
         "androidx.tracing_tracing-ktx",
         "auto_value_annotations",
         "guava",
@@ -237,12 +237,12 @@ android_library_import {
         "Aperture_androidx.camera_camera-core",
         "Aperture_androidx.camera_camera-lifecycle",
         "Aperture_androidx.camera_camera-video",
-        "Aperture_androidx.lifecycle_lifecycle-common",
         "androidx.annotation_annotation",
         "androidx.annotation_annotation-experimental",
         "androidx.appcompat_appcompat",
         "androidx.concurrent_concurrent-futures",
         "androidx.core_core",
+        "androidx.lifecycle_lifecycle-common",
         "auto_value_annotations",
         "guava",
     ],
@@ -262,12 +262,12 @@ android_library {
         "Aperture_androidx.camera_camera-core",
         "Aperture_androidx.camera_camera-lifecycle",
         "Aperture_androidx.camera_camera-video",
-        "Aperture_androidx.lifecycle_lifecycle-common",
         "androidx.annotation_annotation",
         "androidx.annotation_annotation-experimental",
         "androidx.appcompat_appcompat",
         "androidx.concurrent_concurrent-futures",
         "androidx.core_core",
+        "androidx.lifecycle_lifecycle-common",
         "auto_value_annotations",
         "guava",
     ],
@@ -324,34 +324,6 @@ android_library {
     java_version: "1.7",
 }
 
-java_import {
-    name: "Aperture_androidx.lifecycle_lifecycle-common-nodeps",
-    jars: ["androidx/lifecycle/lifecycle-common/2.6.2/lifecycle-common-2.6.2.jar"],
-    sdk_version: "35",
-    min_sdk_version: "14",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-}
-
-java_library_static {
-    name: "Aperture_androidx.lifecycle_lifecycle-common",
-    sdk_version: "35",
-    min_sdk_version: "14",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "Aperture_androidx.lifecycle_lifecycle-common-nodeps",
-        "androidx.annotation_annotation",
-        "kotlin-stdlib",
-        "kotlinx-coroutines-android",
-    ],
-    java_version: "1.7",
-}
-
 android_library_import {
     name: "Aperture_androidx.media3_media3-common-nodeps",
     aars: ["androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar"],
@@ -632,66 +604,6 @@ android_library {
     java_version: "1.7",
 }
 
-android_library_import {
-    name: "Aperture_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: [
-        "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",
-        "error_prone_annotations",
-    ],
-}
-
-android_library {
-    name: "Aperture_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: [
-        "Aperture_com.google.android.material_material-nodeps",
-        "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",
-        "error_prone_annotations",
-    ],
-    java_version: "1.7",
-}
-
 java_import {
     name: "Aperture_com.google.zxing_core-nodeps",
     jars: ["com/google/zxing/core/3.5.3/core-3.5.3.jar"],