Update media provider's exoplayer version

Bug: 223572414
Test: atest CtsPhotoPickerTest MediaProviderTests
Change-Id: I737e6f731125a3a7d7b9f260cb1ef6c710893331
Merged-In: I737e6f731125a3a7d7b9f260cb1ef6c710893331

2 files changed, 47 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 281ef47a..b60a2021 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,17 +44,55 @@ license {
 android_library {
     name: "exoplayer-mediaprovider-ui",
     srcs: [
-        "tree_410ddf458c4daebcf3f997084891c82f2dbd6805/library/common/src/main/java/**/*.java",
-        "tree_410ddf458c4daebcf3f997084891c82f2dbd6805/library/core/src/main/java/**/*/*.java",
-        "tree_410ddf458c4daebcf3f997084891c82f2dbd6805/library/extractor/src/main/java/**/*.java",
-        "tree_410ddf458c4daebcf3f997084891c82f2dbd6805/library/ui/src/main/java/**/*.java"
+        "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/ui/src/main/java/**/*.java",
     ],
     resource_dirs: [
-        "tree_410ddf458c4daebcf3f997084891c82f2dbd6805/library/ui/src/main/res",
+        "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/ui/src/main/res",
     ],
     sdk_version: "31",     // Needs to be a prebuilt, so not "current".
     min_sdk_version: "16", // match with
-                           // tree_410ddf458c4daebcf3f997084891c82f2dbd6805/constants.gradle
+                           // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
+    libs: ["androidx.annotation_annotation"],
+    static_libs: [
+        "androidx.core_core",
+        "androidx.media_media",
+        "androidx.recyclerview_recyclerview",
+        "error_prone_annotations",
+        "exoplayer-annotation_stubs",
+        "exoplayer-mediaprovider-core",
+        "guava",
+        "jsr305",
+    ],
+    apex_available: [
+        "com.android.mediaprovider",
+        "//apex_available:platform",
+    ],
+
+    manifest: "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/ui/src/main/AndroidManifest.xml",
+    jarjar_rules: "annotation-stripping-jarjar-rules.txt",
+    visibility: ["//packages/providers/MediaProvider:__subpackages__"],
+    notice: "LICENSE"
+}
+
+// Needed because exoplayer-mediaprovider-ui depends on a resource from core, using the core package
+// name, meaning the resources from this target need to use the package name from core's manifest,
+// while exoplayer-mediaprovider-ui resources need to keep ui's package name.
+android_library {
+    name: "exoplayer-mediaprovider-core",
+    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",
+    ],
+    resource_dirs: [
+        "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/res",
+    ],
+    sdk_version: "31",     // Needs to be a prebuilt, so not "current".
+    min_sdk_version: "16", // match with
+                           // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
     libs: ["androidx.annotation_annotation"],
     static_libs: [
         "androidx.core_core",
@@ -68,9 +106,9 @@ android_library {
     apex_available: [
         "com.android.mediaprovider",
     ],
-    manifest: "tree_410ddf458c4daebcf3f997084891c82f2dbd6805/library/ui/src/main/AndroidManifest.xml",
+    manifest: "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/AndroidManifest.xml",
     jarjar_rules: "annotation-stripping-jarjar-rules.txt",
-    visibility: ["//packages/providers/MediaProvider:__subpackages__",],
+    visibility: ["//visibility:private"],
     notice: "LICENSE"
 }
 
diff --git a/tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/ui/src/main/res/values/public.xml b/tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/ui/src/main/res/values/public.xml
index e9c958a0..ae75925e 100644
--- a/tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/ui/src/main/res/values/public.xml
+++ b/tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/ui/src/main/res/values/public.xml
@@ -13,4 +13,4 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources><public /></resources>
+<resources></resources>