[automerge] Do not run tests that require work profile setup in presubmit 2p: 47498a9d75 am: 41bea579ba am: 276402a230 am: 2fe6c86565 am: 7353b92dd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/exoplayer/+/17884334
Change-Id: Ie6ccd201d6406932abdc852dde428a5d384e4f4f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index ea96b24..f5e9799 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,6 +105,7 @@
],
apex_available: [
"com.android.mediaprovider",
+ "//apex_available:platform",
],
manifest: "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/core/src/main/AndroidManifest.xml",
jarjar_rules: "annotation-stripping-jarjar-rules.txt",
@@ -168,6 +169,41 @@
notice: "LICENSE",
}
+android_library {
+ name: "exoplayer-vendor_cwral", // Intentionally using an acronym to hide vendor's structure.
+ srcs: [
+ "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/common/src/main/java/**/*.java",
+ "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/java/**/*/*.java",
+ "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/database/src/main/java/**/*.java",
+ "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/datasource/src/main/java/**/*.java",
+ "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/decoder/src/main/java/**/*/*.java",
+ "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/extractor/src/main/java/**/*.java",
+ "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/extensions/vp9/src/main/java/**/*.java",
+ ],
+ resource_dirs: [
+ "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/res",
+ ],
+ manifest: "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/AndroidManifest.xml",
+ sdk_version: "31", // Needs to be a prebuilt, so not "current".
+ min_sdk_version: "16", // match with
+ // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
+ apex_available: [
+ "//apex_available:platform",
+ ],
+ static_libs: [
+ "androidx.annotation_annotation",
+ "androidx.core_core",
+ "error_prone_annotations",
+ "exoplayer-annotation_stubs",
+ "guava",
+ "jsr305"
+ ],
+ jarjar_rules: "annotation-stripping-jarjar-rules.txt",
+ visibility: ["//vendor:__subpackages__"], // Visibility for vendor's subdirs is not allowed, so
+ // we can limit visibility to vendor, at most.
+ notice: "LICENSE",
+}
+
// Exposes util classes for testing MediaParser.
android_library {
name: "exoplayer-cts_media-test_utils",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 260e1e9..ed599dc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -24,6 +24,9 @@
"postsubmit": [
{
"name": "CtsPhotoPickerTest"
+ },
+ {
+ "name": "ClockworkRetailAttractLoopRoboTests"
}
]
}
diff --git a/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderRenderer.java
index cb9c4eb..ba9db33 100644
--- a/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderRenderer.java
+++ b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderRenderer.java
@@ -29,7 +29,8 @@
* GLSurfaceView.Renderer implementation that can render YUV Frames returned by a video decoder
* after decoding. It does the YUV to RGB color conversion in the Fragment Shader.
*/
-/* package */ class VideoDecoderRenderer
+/* package */
+public class VideoDecoderRenderer
implements GLSurfaceView.Renderer, VideoDecoderOutputBufferRenderer {
private static final float[] kColorConversion601 = {
diff --git a/tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DefaultMediaCodecAdapterFactory.java b/tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DefaultMediaCodecAdapterFactory.java
index 6c8ba32..8f54818 100644
--- a/tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DefaultMediaCodecAdapterFactory.java
+++ b/tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DefaultMediaCodecAdapterFactory.java
@@ -15,7 +15,9 @@
*/
package com.google.android.exoplayer2.mediacodec;
+import android.annotation.TargetApi;
import android.media.MediaCodec;
+import android.os.Build;
import androidx.annotation.IntDef;
import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.MimeTypes;
@@ -104,6 +106,7 @@
enableImmediateCodecStartAfterFlush = enabled;
}
+ @TargetApi(Build.VERSION_CODES.M)
@Override
public MediaCodecAdapter createAdapter(MediaCodecAdapter.Configuration configuration)
throws IOException {
