Aperture: Update androidx.media3 to 1.1.1
Change-Id: I16a3fea4aa495c95e5d25e081ef23956c5d070e1
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f8dd81d..42832d0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -83,7 +83,7 @@
implementation("androidx.camera:camera-extensions:${cameraxVersion}")
// Media3
- val media3Version = "1.0.2"
+ val media3Version = "1.1.1"
// For media playback using ExoPlayer
implementation("androidx.media3:media3-exoplayer:$media3Version")
// For building media playback UIs
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index 354ae94..42829b7 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -276,7 +276,7 @@
android_library_import {
name: "Aperture_androidx.media3_media3-common-nodeps",
- aars: ["androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar"],
+ aars: ["androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -297,7 +297,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/media3/media3-common/1.0.2/AndroidManifest.xml",
+ manifest: "androidx/media3/media3-common/1.1.1/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.media3_media3-common-nodeps",
"guava",
@@ -307,8 +307,38 @@
}
android_library_import {
+ name: "Aperture_androidx.media3_media3-container-nodeps",
+ aars: ["androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar"],
+ sdk_version: "33",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Aperture_androidx.media3_media3-common",
+ ],
+}
+
+android_library {
+ name: "Aperture_androidx.media3_media3-container",
+ sdk_version: "33",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "androidx/media3/media3-container/1.1.1/AndroidManifest.xml",
+ static_libs: [
+ "Aperture_androidx.media3_media3-container-nodeps",
+ "Aperture_androidx.media3_media3-common",
+ ],
+ java_version: "1.7",
+}
+
+android_library_import {
name: "Aperture_androidx.media3_media3-database-nodeps",
- aars: ["androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar"],
+ aars: ["androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -328,7 +358,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/media3/media3-database/1.0.2/AndroidManifest.xml",
+ manifest: "androidx/media3/media3-database/1.1.1/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.media3_media3-database-nodeps",
"Aperture_androidx.media3_media3-common",
@@ -338,7 +368,7 @@
android_library_import {
name: "Aperture_androidx.media3_media3-datasource-nodeps",
- aars: ["androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar"],
+ aars: ["androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -359,7 +389,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/media3/media3-datasource/1.0.2/AndroidManifest.xml",
+ manifest: "androidx/media3/media3-datasource/1.1.1/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.media3_media3-datasource-nodeps",
"Aperture_androidx.media3_media3-common",
@@ -370,7 +400,7 @@
android_library_import {
name: "Aperture_androidx.media3_media3-decoder-nodeps",
- aars: ["androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar"],
+ aars: ["androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -390,7 +420,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/media3/media3-decoder/1.0.2/AndroidManifest.xml",
+ manifest: "androidx/media3/media3-decoder/1.1.1/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.media3_media3-decoder-nodeps",
"Aperture_androidx.media3_media3-common",
@@ -400,7 +430,7 @@
android_library_import {
name: "Aperture_androidx.media3_media3-exoplayer-nodeps",
- aars: ["androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar"],
+ aars: ["androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -409,6 +439,7 @@
],
static_libs: [
"Aperture_androidx.media3_media3-common",
+ "Aperture_androidx.media3_media3-container",
"Aperture_androidx.media3_media3-datasource",
"Aperture_androidx.media3_media3-decoder",
"Aperture_androidx.media3_media3-extractor",
@@ -425,10 +456,11 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/media3/media3-exoplayer/1.0.2/AndroidManifest.xml",
+ manifest: "androidx/media3/media3-exoplayer/1.1.1/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.media3_media3-exoplayer-nodeps",
"Aperture_androidx.media3_media3-common",
+ "Aperture_androidx.media3_media3-container",
"Aperture_androidx.media3_media3-datasource",
"Aperture_androidx.media3_media3-decoder",
"Aperture_androidx.media3_media3-extractor",
@@ -440,7 +472,7 @@
android_library_import {
name: "Aperture_androidx.media3_media3-extractor-nodeps",
- aars: ["androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar"],
+ aars: ["androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -449,6 +481,7 @@
],
static_libs: [
"Aperture_androidx.media3_media3-common",
+ "Aperture_androidx.media3_media3-container",
"Aperture_androidx.media3_media3-decoder",
],
}
@@ -461,10 +494,11 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/media3/media3-extractor/1.0.2/AndroidManifest.xml",
+ manifest: "androidx/media3/media3-extractor/1.1.1/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.media3_media3-extractor-nodeps",
"Aperture_androidx.media3_media3-common",
+ "Aperture_androidx.media3_media3-container",
"Aperture_androidx.media3_media3-decoder",
],
java_version: "1.7",
@@ -472,7 +506,7 @@
android_library_import {
name: "Aperture_androidx.media3_media3-ui-nodeps",
- aars: ["androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar"],
+ aars: ["androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar"],
sdk_version: "33",
min_sdk_version: "14",
apex_available: [
@@ -494,7 +528,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/media3/media3-ui/1.0.2/AndroidManifest.xml",
+ manifest: "androidx/media3/media3-ui/1.1.1/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.media3_media3-ui-nodeps",
"Aperture_androidx.media3_media3-common",
diff --git a/app/libs/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar b/app/libs/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar
deleted file mode 100644
index 0e402be..0000000
--- a/app/libs/androidx/media3/media3-common/1.0.2/media3-common-1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/media3/media3-common/1.0.2/AndroidManifest.xml b/app/libs/androidx/media3/media3-common/1.1.1/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/media3/media3-common/1.0.2/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-common/1.1.1/AndroidManifest.xml
diff --git a/app/libs/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar b/app/libs/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar
new file mode 100644
index 0000000..495d6f6
--- /dev/null
+++ b/app/libs/androidx/media3/media3-common/1.1.1/media3-common-1.1.1.aar
Binary files differ
diff --git a/app/libs/androidx/media3/media3-container/1.1.1/AndroidManifest.xml b/app/libs/androidx/media3/media3-container/1.1.1/AndroidManifest.xml
new file mode 100644
index 0000000..5f4f689
--- /dev/null
+++ b/app/libs/androidx/media3/media3-container/1.1.1/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2023 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.media3.container" >
+
+ <uses-sdk
+ android:minSdkVersion="16"
+ android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar b/app/libs/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar
new file mode 100644
index 0000000..70aca00
--- /dev/null
+++ b/app/libs/androidx/media3/media3-container/1.1.1/media3-container-1.1.1.aar
Binary files differ
diff --git a/app/libs/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar b/app/libs/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar
deleted file mode 100644
index c4c9c37..0000000
--- a/app/libs/androidx/media3/media3-database/1.0.2/media3-database-1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/media3/media3-database/1.0.2/AndroidManifest.xml b/app/libs/androidx/media3/media3-database/1.1.1/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/media3/media3-database/1.0.2/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-database/1.1.1/AndroidManifest.xml
diff --git a/app/libs/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar b/app/libs/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar
new file mode 100644
index 0000000..b256e44
--- /dev/null
+++ b/app/libs/androidx/media3/media3-database/1.1.1/media3-database-1.1.1.aar
Binary files differ
diff --git a/app/libs/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar b/app/libs/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar
deleted file mode 100644
index 7a24948..0000000
--- a/app/libs/androidx/media3/media3-datasource/1.0.2/media3-datasource-1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/media3/media3-datasource/1.0.2/AndroidManifest.xml b/app/libs/androidx/media3/media3-datasource/1.1.1/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/media3/media3-datasource/1.0.2/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-datasource/1.1.1/AndroidManifest.xml
diff --git a/app/libs/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar b/app/libs/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar
new file mode 100644
index 0000000..fb43508
--- /dev/null
+++ b/app/libs/androidx/media3/media3-datasource/1.1.1/media3-datasource-1.1.1.aar
Binary files differ
diff --git a/app/libs/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar b/app/libs/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar
deleted file mode 100644
index fec3862..0000000
--- a/app/libs/androidx/media3/media3-decoder/1.0.2/media3-decoder-1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/media3/media3-decoder/1.0.2/AndroidManifest.xml b/app/libs/androidx/media3/media3-decoder/1.1.1/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/media3/media3-decoder/1.0.2/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-decoder/1.1.1/AndroidManifest.xml
diff --git a/app/libs/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar b/app/libs/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar
new file mode 100644
index 0000000..cbc13ee
--- /dev/null
+++ b/app/libs/androidx/media3/media3-decoder/1.1.1/media3-decoder-1.1.1.aar
Binary files differ
diff --git a/app/libs/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar b/app/libs/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar
deleted file mode 100644
index a9a98db..0000000
--- a/app/libs/androidx/media3/media3-exoplayer/1.0.2/media3-exoplayer-1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/media3/media3-exoplayer/1.0.2/AndroidManifest.xml b/app/libs/androidx/media3/media3-exoplayer/1.1.1/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/media3/media3-exoplayer/1.0.2/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-exoplayer/1.1.1/AndroidManifest.xml
diff --git a/app/libs/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar b/app/libs/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar
new file mode 100644
index 0000000..1aba21b
--- /dev/null
+++ b/app/libs/androidx/media3/media3-exoplayer/1.1.1/media3-exoplayer-1.1.1.aar
Binary files differ
diff --git a/app/libs/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar b/app/libs/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar
deleted file mode 100644
index a81c11b..0000000
--- a/app/libs/androidx/media3/media3-extractor/1.0.2/media3-extractor-1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/media3/media3-extractor/1.0.2/AndroidManifest.xml b/app/libs/androidx/media3/media3-extractor/1.1.1/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/media3/media3-extractor/1.0.2/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-extractor/1.1.1/AndroidManifest.xml
diff --git a/app/libs/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar b/app/libs/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar
new file mode 100644
index 0000000..8e428ac
--- /dev/null
+++ b/app/libs/androidx/media3/media3-extractor/1.1.1/media3-extractor-1.1.1.aar
Binary files differ
diff --git a/app/libs/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar b/app/libs/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar
deleted file mode 100644
index ca30387..0000000
--- a/app/libs/androidx/media3/media3-ui/1.0.2/media3-ui-1.0.2.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/media3/media3-ui/1.0.2/AndroidManifest.xml b/app/libs/androidx/media3/media3-ui/1.1.1/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/media3/media3-ui/1.0.2/AndroidManifest.xml
rename to app/libs/androidx/media3/media3-ui/1.1.1/AndroidManifest.xml
diff --git a/app/libs/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar b/app/libs/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar
new file mode 100644
index 0000000..968c986
--- /dev/null
+++ b/app/libs/androidx/media3/media3-ui/1.1.1/media3-ui-1.1.1.aar
Binary files differ