Glimpse: Update androidx.media3

Change-Id: I8b35cb04809a4000f7d15d266c2316bc2c721862

app/build.gradle.kts

@@ -66,8 +66,8 @@ dependencies {
     implementation("com.google.android.material:material:1.9.0")
 
     // Media3
-    implementation("androidx.media3:media3-exoplayer:1.1.0")
-    implementation("androidx.media3:media3-ui:1.1.0")
+    implementation("androidx.media3:media3-exoplayer:1.1.1")
+    implementation("androidx.media3:media3-ui:1.1.1")
 
     // Navigation
     implementation("androidx.navigation:navigation-fragment-ktx:2.6.0")
@@ -135,9 +135,8 @@ tasks.register("generateBp") {
     val isAvailableInAosp = { group: String, artifactId: String ->
         when {
             group.startsWith("androidx") -> {
-                // We provide our own androidx.{media3,multidex} & lifecycle-common
+                // We provide our own androidx.media3 & lifecycle-common
                 !group.startsWith("androidx.media3") &&
-                        !group.startsWith("androidx.multidex") &&
                         artifactId != "lifecycle-common"
             }
 

app/libs/Android.bp

@@ -28,7 +28,7 @@ java_library_static {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-common-nodeps",
-    aars: ["androidx/media3/media3-common/1.1.0/media3-common-1.1.0.aar"],
+    aars: ["androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -38,7 +38,6 @@ android_library_import {
     static_libs: [
         "guava",
         "androidx.annotation_annotation-experimental",
-        "Glimpse_androidx.multidex_multidex",
     ],
 }
 
@@ -50,19 +49,18 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-common/1.1.0/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-common/1.1.1/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-common-nodeps",
         "guava",
         "androidx.annotation_annotation-experimental",
-        "Glimpse_androidx.multidex_multidex",
     ],
     java_version: "1.7",
 }
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-container-nodeps",
-    aars: ["androidx/media3/media3-container/1.1.0/media3-container-1.1.0.aar"],
+    aars: ["androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -70,7 +68,6 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
     ],
 }
@@ -83,10 +80,9 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-container/1.1.0/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-container/1.1.1/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-container-nodeps",
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
     ],
     java_version: "1.7",
@@ -94,7 +90,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-database-nodeps",
-    aars: ["androidx/media3/media3-database/1.1.0/media3-database-1.1.0.aar"],
+    aars: ["androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -102,7 +98,6 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
     ],
 }
@@ -115,10 +110,9 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-database/1.1.0/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-database/1.1.1/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-database-nodeps",
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
     ],
     java_version: "1.7",
@@ -126,7 +120,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-datasource-nodeps",
-    aars: ["androidx/media3/media3-datasource/1.1.0/media3-datasource-1.1.0.aar"],
+    aars: ["androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -134,7 +128,6 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
         "Glimpse_androidx.media3_media3-database",
     ],
@@ -148,10 +141,9 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-datasource/1.1.0/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-datasource/1.1.1/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-datasource-nodeps",
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
         "Glimpse_androidx.media3_media3-database",
     ],
@@ -160,7 +152,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-decoder-nodeps",
-    aars: ["androidx/media3/media3-decoder/1.1.0/media3-decoder-1.1.0.aar"],
+    aars: ["androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -168,7 +160,6 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
     ],
 }
@@ -181,10 +172,9 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-decoder/1.1.0/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-decoder/1.1.1/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-decoder-nodeps",
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
     ],
     java_version: "1.7",
@@ -192,7 +182,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-exoplayer-nodeps",
-    aars: ["androidx/media3/media3-exoplayer/1.1.0/media3-exoplayer-1.1.0.aar"],
+    aars: ["androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -206,7 +196,6 @@ android_library_import {
         "Glimpse_androidx.media3_media3-decoder",
         "Glimpse_androidx.media3_media3-extractor",
         "Glimpse_androidx.media3_media3-database",
-        "Glimpse_androidx.multidex_multidex",
         "androidx.core_core",
     ],
 }
@@ -219,7 +208,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-exoplayer/1.1.0/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-exoplayer/1.1.1/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-exoplayer-nodeps",
         "Glimpse_androidx.media3_media3-common",
@@ -228,7 +217,6 @@ android_library {
         "Glimpse_androidx.media3_media3-decoder",
         "Glimpse_androidx.media3_media3-extractor",
         "Glimpse_androidx.media3_media3-database",
-        "Glimpse_androidx.multidex_multidex",
         "androidx.core_core",
     ],
     java_version: "1.7",
@@ -236,7 +224,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-extractor-nodeps",
-    aars: ["androidx/media3/media3-extractor/1.1.0/media3-extractor-1.1.0.aar"],
+    aars: ["androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -244,7 +232,6 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
         "Glimpse_androidx.media3_media3-container",
         "Glimpse_androidx.media3_media3-decoder",
@@ -259,10 +246,9 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-extractor/1.1.0/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-extractor/1.1.1/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-extractor-nodeps",
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
         "Glimpse_androidx.media3_media3-container",
         "Glimpse_androidx.media3_media3-decoder",
@@ -272,7 +258,7 @@ android_library {
 
 android_library_import {
     name: "Glimpse_androidx.media3_media3-ui-nodeps",
-    aars: ["androidx/media3/media3-ui/1.1.0/media3-ui-1.1.0.aar"],
+    aars: ["androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -280,7 +266,6 @@ android_library_import {
         "//apex_available:anyapex",
     ],
     static_libs: [
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
         "androidx.media_media",
         "androidx.recyclerview_recyclerview",
@@ -295,10 +280,9 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/media3/media3-ui/1.1.0/AndroidManifest.xml",
+    manifest: "androidx/media3/media3-ui/1.1.1/AndroidManifest.xml",
     static_libs: [
         "Glimpse_androidx.media3_media3-ui-nodeps",
-        "Glimpse_androidx.multidex_multidex",
         "Glimpse_androidx.media3_media3-common",
         "androidx.media_media",
         "androidx.recyclerview_recyclerview",
@@ -306,33 +290,6 @@ android_library {
     java_version: "1.7",
 }
 
-android_library_import {
-    name: "Glimpse_androidx.multidex_multidex-nodeps",
-    aars: ["androidx/multidex/multidex/2.0.1/multidex-2.0.1.aar"],
-    sdk_version: "33",
-    min_sdk_version: "14",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [],
-}
-
-android_library {
-    name: "Glimpse_androidx.multidex_multidex",
-    sdk_version: "33",
-    min_sdk_version: "14",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    manifest: "androidx/multidex/multidex/2.0.1/AndroidManifest.xml",
-    static_libs: [
-        "Glimpse_androidx.multidex_multidex-nodeps",
-    ],
-    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"],

app/libs/androidx/multidex/multidex/2.0.1/AndroidManifest.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.multidex" >
-
-    <uses-sdk android:minSdkVersion="4" />
-
-</manifest>