Merge "Update androidx.test.runner to 1.5.3-alpha01" am: b08c85a39b am: 3d66851dc1

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2441321

Change-Id: I6092c92265f29ebbfb88d831859f29fc88ba03ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7 files changed, 20 insertions, 12 deletions

diff --git a/common/androidx-test/Android.bp b/common/androidx-test/Android.bp
index 7f0a4102..be6e1019 100644
--- a/common/androidx-test/Android.bp
+++ b/common/androidx-test/Android.bp
@@ -5,6 +5,15 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+filegroup {
+    name: "test-services.apk",
+    srcs: ["androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk"],
+    path: "androidx/test/services/test-services/1.4.2",
+    visibility: [
+        "//tools/tradefederation/core:__pkg__",
+    ],
+}
+
 android_library_import {
     name: "androidx.test.annotation-nodeps",
     aars: ["androidx/test/annotation/1.0.1/annotation-1.0.1.aar"],
@@ -457,7 +466,7 @@ android_library {
 
 android_library_import {
     name: "androidx.test.runner-nodeps",
-    aars: ["androidx/test/runner/1.5.2/runner-1.5.2.aar"],
+    aars: ["androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar"],
     sdk_version: "current",
     apex_available: [
         "//apex_available:platform",
@@ -541,12 +550,3 @@ android_app_import {
     presigned: true,
 
 }
-
-filegroup {
-    name: "test-services.apk",
-    srcs: ["androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk",],
-    path: "androidx/test/services/test-services/1.4.2",
-    visibility: [
-        "//tools/tradefederation/core:__pkg__",
-    ],
-}
diff --git a/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.aar b/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.aar
deleted file mode 100644
index 2517c9b0..00000000
--- a/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.aar
+++ /dev/null
diff --git a/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2-sources.jar b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01-sources.jar
index afc4076d..090711e2 100644
--- a/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2-sources.jar
+++ b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01-sources.jar
diff --git a/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar
new file mode 100644
index 00000000..0140d16b
--- /dev/null
+++ b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.aar
diff --git a/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.pom b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom
index 304162de..0ae83def 100644
--- a/common/androidx-test/androidx/test/runner/1.5.2/runner-1.5.2.pom
+++ b/common/androidx-test/androidx/test/runner/1.5.3-alpha01/runner-1.5.3-alpha01.pom
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.test</groupId>
   <artifactId>runner</artifactId>
-  <version>1.5.2</version>
+  <version>1.5.3-alpha01</version>
   <packaging>aar</packaging>
   <name>AndroidX Test Library</name>
   <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>
diff --git a/common/androidx-test/prepend-license.txt b/common/androidx-test/prepend-license.txt
index d137074a..8c4065d8 100644
--- a/common/androidx-test/prepend-license.txt
+++ b/common/androidx-test/prepend-license.txt
@@ -2,3 +2,11 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+filegroup {
+    name: "test-services.apk",
+    srcs: ["androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk",],
+    path: "androidx/test/services/test-services/1.4.2",
+    visibility: [
+        "//tools/tradefederation/core:__pkg__",
+    ],
+}
diff --git a/common/androidx-test/update-from-gmaven.py b/common/androidx-test/update-from-gmaven.py
index 75120488..8b289297 100755
--- a/common/androidx-test/update-from-gmaven.py
+++ b/common/androidx-test/update-from-gmaven.py
@@ -20,7 +20,7 @@ import sys
 
 annotationVersion="1.0.1"
 monitorVersion="1.6.1"
-runnerVersion="1.5.2"
+runnerVersion="1.5.3-alpha01"
 rulesVersion="1.5.0"
 espressoVersion="3.5.1"
 coreVersion="1.5.0"