Import media3 1.0.0-beta03 session and common into prebuilts/misc/common am: d0311ab46e
Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2607052
Change-Id: I62fc4dcdc2d779d9041f3deeff11e87eb4510029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/common/androidx-media3/Android.bp b/common/androidx-media3/Android.bp
new file mode 100644
index 0000000..d7a93db
--- /dev/null
+++ b/common/androidx-media3/Android.bp
@@ -0,0 +1,78 @@
+// This is a generated file. Do not modify directly.
+// Automatically generated with:
+// pom2bp -rewrite 'androidx.media3:=androidx.media3.' -rewrite 'androidx.annotation:annotation=androidx.annotation_annotation' -rewrite 'androidx.annotation:annotation-experimental=androidx.annotation_annotation-experimental' -rewrite 'androidx.collection:collection=androidx.collection_collection' -rewrite 'androidx.media:media=androidx.media_media' -rewrite 'com.google.guava:guava=guava' -sdk-version current -static-deps -prepend prepend-license.txt .
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_library_import {
+ name: "androidx.media3.media3-common-nodeps",
+ aars: ["androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.aar"],
+ sdk_version: "current",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ min_sdk_version: "16",
+ static_libs: [
+ "guava",
+ "androidx.annotation_annotation",
+ "androidx.annotation_annotation-experimental",
+ ],
+ visibility: ["//visibility:private"]
+}
+
+android_library {
+ name: "androidx.media3.media3-common",
+ sdk_version: "current",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ min_sdk_version: "16",
+ manifest: "manifests/androidx.media3.media3-common/AndroidManifest.xml",
+ static_libs: [
+ "androidx.media3.media3-common-nodeps",
+ "guava",
+ "androidx.annotation_annotation",
+ "androidx.annotation_annotation-experimental",
+ ],
+ java_version: "1.7",
+ visibility: ["//visibility:private"]
+}
+
+android_library_import {
+ name: "androidx.media3.media3-session-nodeps",
+ aars: ["androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.aar"],
+ sdk_version: "current",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ min_sdk_version: "16",
+ static_libs: [
+ "androidx.collection_collection",
+ "androidx.media3.media3-common",
+ "androidx.media_media",
+ ],
+ visibility: ["//visibility:private"]
+}
+
+android_library {
+ name: "androidx.media3.media3-session",
+ sdk_version: "current",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ min_sdk_version: "16",
+ manifest: "manifests/androidx.media3.media3-session/AndroidManifest.xml",
+ static_libs: [
+ "androidx.media3.media3-session-nodeps",
+ "androidx.collection_collection",
+ "androidx.media3.media3-common",
+ "androidx.media_media",
+ ],
+ java_version: "1.7",
+ visibility: ["//visibility:private"]
+}
diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03-sources.jar b/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03-sources.jar
new file mode 100644
index 0000000..c2e9663
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03-sources.jar
Binary files differ
diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.aar b/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.aar
new file mode 100644
index 0000000..975482b
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.aar
Binary files differ
diff --git a/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.pom b/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.pom
new file mode 100644
index 0000000..e8b703b
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-common/1.0.0-beta03/media3-common-1.0.0-beta03.pom
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <!-- This module was also published with a richer model, Gradle metadata, -->
+ <!-- which should be used instead. Do not delete the following line which -->
+ <!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
+ <!-- that they should prefer consuming it instead. -->
+ <!-- do_not_remove: published-with-gradle-metadata -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-common</artifactId>
+ <version>1.0.0-beta03</version>
+ <packaging>aar</packaging>
+ <name>Media3 common module</name>
+ <description>Media3 common module</description>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <name>The Android Open Source Project</name>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:https://github.com/androidx/media.git</connection>
+ <url>https://github.com/androidx/media</url>
+ </scm>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-cast</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-database</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-datasource</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-datasource-cronet</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-datasource-okhttp</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-datasource-rtmp</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-decoder</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-effect</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-exoplayer</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-exoplayer-dash</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-exoplayer-hls</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-exoplayer-ima</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-exoplayer-rtsp</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-exoplayer-smoothstreaming</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-exoplayer-workmanager</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-extractor</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-session</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-transformer</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-ui</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-ui-leanback</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-test-utils</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-test-utils-robolectric</artifactId>
+ <version>1.0.0-beta03</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>31.0.1-android</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>j2objc-annotations</artifactId>
+ <groupId>com.google.j2objc</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>checker-compat-qual</artifactId>
+ <groupId>org.checkerframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jsr305</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>checker-qual</artifactId>
+ <groupId>org.checkerframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>error_prone_annotations</artifactId>
+ <groupId>com.google.errorprone</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>androidx.annotation</groupId>
+ <artifactId>annotation-experimental</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ <type>aar</type>
+ </dependency>
+ <dependency>
+ <groupId>androidx.annotation</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.3.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03-sources.jar b/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03-sources.jar
new file mode 100644
index 0000000..d3a4b9e
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03-sources.jar
Binary files differ
diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.aar b/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.aar
new file mode 100644
index 0000000..804b031
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.aar
Binary files differ
diff --git a/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.pom b/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.pom
new file mode 100644
index 0000000..b889125
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-session/1.0.0-beta03/media3-session-1.0.0-beta03.pom
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <!-- This module was also published with a richer model, Gradle metadata, -->
+ <!-- which should be used instead. Do not delete the following line which -->
+ <!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
+ <!-- that they should prefer consuming it instead. -->
+ <!-- do_not_remove: published-with-gradle-metadata -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-session</artifactId>
+ <version>1.0.0-beta03</version>
+ <packaging>aar</packaging>
+ <name>Media3 Session module</name>
+ <description>Media3 Session module</description>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <name>The Android Open Source Project</name>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:https://github.com/androidx/media.git</connection>
+ <url>https://github.com/androidx/media</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-common</artifactId>
+ <version>1.0.0-beta03</version>
+ <scope>compile</scope>
+ <type>aar</type>
+ </dependency>
+ <dependency>
+ <groupId>androidx.collection</groupId>
+ <artifactId>collection</artifactId>
+ <version>1.1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media</groupId>
+ <artifactId>media</artifactId>
+ <version>1.6.0</version>
+ <scope>runtime</scope>
+ <type>aar</type>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-common/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-common/AndroidManifest.xml
new file mode 100644
index 0000000..2431e06
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-common/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2020 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.common" >
+
+ <uses-sdk
+ android:minSdkVersion="16"
+ android:targetSdkVersion="30" />
+
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+</manifest>
\ No newline at end of file
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-session/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-session/AndroidManifest.xml
new file mode 100644
index 0000000..79ef105
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-session/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2018 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.session" >
+
+ <uses-sdk
+ android:minSdkVersion="16"
+ android:targetSdkVersion="30" />
+
+</manifest>
\ No newline at end of file
