summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRakesh Kumar <rakesh.kumar@ittiam.com>2023-08-17 20:07:33 +0530
committerCherrypicker Worker <android-build-cherrypicker-worker@google.com>2023-11-14 16:09:51 +0000
commit5336ec267ae2d882aee90ab2a34d265f41c35f08 (patch)
treeb1f98bc6f1c57ec28c31b0c661d78e9de041fd0d
parentf3c296ae597ca52c677a59b9aa8327dbdd793a97 (diff)
downloadmisc-5336ec267ae2d882aee90ab2a34d265f41c35f08.tar.gz
Import media3-test-utils:1.0.2 prebuilts
Bug: 278751385 Test: m androidx.media3.media3-test-utils (cherry picked from https://android-review.googlesource.com/q/commit:08559b540a78303d81add58032cc74bb2bc7aac7) Merged-In: I3c2521c5ff96ec2b354c22c3fb701e44036d883f Change-Id: I3c2521c5ff96ec2b354c22c3fb701e44036d883f
-rw-r--r--common/androidx-media3/Android.bp50
-rw-r--r--common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2-sources.jarbin0 -> 157481 bytes
-rw-r--r--common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aarbin0 -> 287036 bytes
-rw-r--r--common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.pom97
-rw-r--r--common/androidx-media3/manifests/androidx.media3.media3-test-utils/AndroidManifest.xml24
-rwxr-xr-xcommon/androidx-media3/update-from-gmaven.py3
6 files changed, 173 insertions, 1 deletions
diff --git a/common/androidx-media3/Android.bp b/common/androidx-media3/Android.bp
index 51b74352..71a5408e 100644
--- a/common/androidx-media3/Android.bp
+++ b/common/androidx-media3/Android.bp
@@ -336,6 +336,56 @@ android_library {
}
android_library_import {
+ name: "androidx.media3.media3-test-utils-nodeps",
+ aars: ["androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aar"],
+ sdk_version: "current",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ min_sdk_version: "16",
+ static_libs: [
+ "androidx.annotation_annotation",
+ "androidx.media3.media3-exoplayer",
+ "androidx.test.core",
+ "androidx.test.ext.junit",
+ "androidx.test.ext.truth",
+ "junit",
+ "mockito-core",
+ "mockwebserver",
+ "truth",
+ "truth-java8-extension",
+ ],
+ visibility: ["//visibility:private"]
+}
+
+android_library {
+ name: "androidx.media3.media3-test-utils",
+ sdk_version: "current",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ min_sdk_version: "16",
+ manifest: "manifests/androidx.media3.media3-test-utils/AndroidManifest.xml",
+ static_libs: [
+ "androidx.media3.media3-test-utils-nodeps",
+ "androidx.annotation_annotation",
+ "androidx.media3.media3-exoplayer",
+ "androidx.test.core",
+ "androidx.test.ext.junit",
+ "androidx.test.ext.truth",
+ "junit",
+ "mockito-core",
+ "mockwebserver",
+ "truth",
+ "truth-java8-extension",
+ ],
+ java_version: "1.7",
+ visibility: library_visibility
+}
+
+android_library_import {
name: "androidx.media3.media3-transformer-nodeps",
aars: ["androidx/media3/media3-transformer/1.0.2/media3-transformer-1.0.2.aar"],
sdk_version: "current",
diff --git a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2-sources.jar b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2-sources.jar
new file mode 100644
index 00000000..22012ddc
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2-sources.jar
Binary files differ
diff --git a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aar b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aar
new file mode 100644
index 00000000..ffe80f6a
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.aar
Binary files differ
diff --git a/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.pom b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.pom
new file mode 100644
index 00000000..fe7743b4
--- /dev/null
+++ b/common/androidx-media3/androidx/media3/media3-test-utils/1.0.2/media3-test-utils-1.0.2.pom
@@ -0,0 +1,97 @@
+<?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-test-utils</artifactId>
+ <version>1.0.2</version>
+ <packaging>aar</packaging>
+ <name>Media3 test utils module</name>
+ <description>Media3 test utils 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>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>3.12.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>androidx.test</groupId>
+ <artifactId>core</artifactId>
+ <version>1.4.0</version>
+ <scope>compile</scope>
+ <type>aar</type>
+ </dependency>
+ <dependency>
+ <groupId>androidx.test.ext</groupId>
+ <artifactId>junit</artifactId>
+ <version>1.1.3</version>
+ <scope>compile</scope>
+ <type>aar</type>
+ </dependency>
+ <dependency>
+ <groupId>androidx.test.ext</groupId>
+ <artifactId>truth</artifactId>
+ <version>1.4.0</version>
+ <scope>compile</scope>
+ <type>aar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <version>1.1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.truth.extensions</groupId>
+ <artifactId>truth-java8-extension</artifactId>
+ <version>1.1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>androidx.annotation</groupId>
+ <artifactId>annotation</artifactId>
+ <version>1.3.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>mockwebserver</artifactId>
+ <version>4.9.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>androidx.media3</groupId>
+ <artifactId>media3-exoplayer</artifactId>
+ <version>1.0.2</version>
+ <scope>runtime</scope>
+ <type>aar</type>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/common/androidx-media3/manifests/androidx.media3.media3-test-utils/AndroidManifest.xml b/common/androidx-media3/manifests/androidx.media3.media3-test-utils/AndroidManifest.xml
new file mode 100644
index 00000000..cc497f3d
--- /dev/null
+++ b/common/androidx-media3/manifests/androidx.media3.media3-test-utils/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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.test.utils" >
+
+ <uses-sdk
+ android:minSdkVersion="16"
+ android:targetSdkVersion="30" />
+
+</manifest> \ No newline at end of file
diff --git a/common/androidx-media3/update-from-gmaven.py b/common/androidx-media3/update-from-gmaven.py
index bf5ec54e..88aef4bd 100755
--- a/common/androidx-media3/update-from-gmaven.py
+++ b/common/androidx-media3/update-from-gmaven.py
@@ -23,7 +23,7 @@
# Manual verification steps:
# 1. Build the 'leaf' imported modules (i.e. the set that ends up depending
# on *everything* transitively), e.g.
-# $ m androidx.media3.media3-exoplayer-dash androidx.media3.media3-exoplayer androidx.media3.media3-session androidx.media3.media3-transformer androidx.media3.media3-ui
+# $ m androidx.media3.media3-exoplayer-dash androidx.media3.media3-exoplayer androidx.media3.media3-session androidx.media3.media3-test-utils androidx.media3.media3-transformer androidx.media3.media3-ui
import os
import subprocess
@@ -111,6 +111,7 @@ downloadArtifact("androidx.media3", "media3-exoplayer", media3Version)
downloadArtifact("androidx.media3", "media3-exoplayer-dash", media3Version)
downloadArtifact("androidx.media3", "media3-extractor", media3Version)
downloadArtifact("androidx.media3", "media3-session", media3Version)
+downloadArtifact("androidx.media3", "media3-test-utils", media3Version)
downloadArtifact("androidx.media3", "media3-transformer", media3Version)
downloadArtifact("androidx.media3", "media3-ui", media3Version)