[automerger skipped] update to exoplayer minsdk19 am: 0fbe9bb3aa am: 21b20f52c6 am: a70e58d77a -s ours
am skip reason: Merged-In I359dd308d41dcba157c7fcd6fb09f5f470d1bddf with SHA-1 c42332cc9a is already in history
Original change: https://android-review.googlesource.com/c/platform/external/exoplayer/+/2852985
Change-Id: I098c5f6209c13e753edc08fdbb2ade07f7fcda94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index e721ca5..56b5c1b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -111,7 +111,6 @@
visibility: ["//visibility:private"],
}
-
// Used by MediaMuxerTest to test features not supported by MediaExtractor.
android_library {
name: "exoplayer-mediamuxer_tests",
@@ -172,37 +171,60 @@
}
android_library {
- name: "exoplayer-vendor_cwral", // Intentionally using an acronym to hide vendor's structure.
+ name: "exoplayer-vendor_cwral",
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",
+ "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/*.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: "19", // match with
- // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
+ // tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/constants.gradle
+ libs: ["androidx.annotation_annotation"],
+ static_libs: [
+ "androidx.core_core",
+ "error_prone_annotations",
+ "exoplayer-annotation_stubs",
+ "exoplayer-vendor_cwral-core",
+ "guava",
+ "jsr305",
+ ],
apex_available: [
"//apex_available:platform",
+ ],
+ manifest: "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/core/src/main/AndroidManifest.xml",
+ jarjar_rules: "annotation-stripping-jarjar-rules.txt",
+ visibility: ["//vendor:__subpackages__"],
+}
+
+android_library {
+ name: "exoplayer-vendor_cwral-core",
+ srcs: [
+ "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/common/src/main/java/**/*.java",
+ "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/core/src/main/java/**/*/*.java",
+ "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/database/src/main/java/**/*.java",
+ "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/datasource/src/main/java/**/*.java",
+ "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/decoder/src/main/java/**/*.java",
+ "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/extractor/src/main/java/**/*.java",
],
+ resource_dirs: [
+ "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/core/src/main/res",
+ ],
+ sdk_version: "31", // Needs to be a prebuilt, so not "current".
+ min_sdk_version: "19", // match with
+ // tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/constants.gradle
+ libs: ["androidx.annotation_annotation"],
static_libs: [
- "androidx.annotation_annotation",
"androidx.core_core",
"error_prone_annotations",
"exoplayer-annotation_stubs",
"guava",
- "jsr305"
+ "jsr305",
],
+ apex_available: [
+ "//apex_available:platform",
+ ],
+ manifest: "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/core/src/main/AndroidManifest.xml",
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.
+ visibility: ["//visibility:private"],
}
// Exposes util classes for testing MediaParser.
@@ -285,3 +307,4 @@
static_libs: ["jsr305"],
visibility: ["//visibility:private"],
}
+
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ed599dc..f898628 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -19,6 +19,9 @@
"exclude-annotation": "androidx.test.filters.LargeTest"
}
]
+ },
+ {
+ "name": "clockwork-retail-attract-loop-robotests"
}
],
"postsubmit": [
@@ -26,7 +29,7 @@
"name": "CtsPhotoPickerTest"
},
{
- "name": "ClockworkRetailAttractLoopRoboTests"
+ "name": "clockwork-retail-attract-loop-robotests"
}
]
}