Merge Android 24Q1 Release (ab/11220357)

Bug: 319669529
Merged-In: I757d59fe781691188ab116abd777ffab9e135811
Change-Id: I2519a0f495cc09955afeba8e24823453f4544655

2 files changed, 45 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 8ad068e1..19073cf4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -179,36 +179,61 @@ java_library {
 }
 
 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",
-    ],
-    resource_dirs: [
-        "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/res",
+        "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/*.java",
     ],
-    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
+    min_sdk_version: "19", // match with 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__"],
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
+}
+
+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",
     ],
+    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"],
     lint: {
         baseline_filename: "lint-baseline.xml",
     },
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ed599dcb..f8986280 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"
     }
   ]
 }