commit 689ea55cb19d1005b8a56eb2c42828fe8f5d90fd
author Paul Duffin <paulduffin@google.com> Mon Jan 31 17:23:09 2022 +0000
committer Paul Duffin <paulduffin@google.com> Mon Jan 31 17:30:59 2022 +0000
tree 968b28cb33f50c35d8d16a345c62c04d85b915f5
parent 0b2e59520647d8d67f274a9d7164ee1b8bf6f9c7

Remove unnecessary usage of repackaged.android.test.base

None of the affected modules use the repackaged classes. They use the
standard classes from android.test.runner and android.test.base which
are provided at runtime because the android.test.runner is specified
in a <uses-library> element in the AndroidManifest.xml.

Bug: 209607558
Test: m GameCoreDevice GameCoreJavaTestCases
Change-Id: I6130ba85e2fcb72d685e8c710f1dd73d1ab5e2de

functional_tests/java/Android.bp

diff --git a/functional_tests/java/Android.bp b/functional_tests/java/Android.bp
index 14b7eed..47cd12a 100644
--- a/functional_tests/java/Android.bp
+++ b/functional_tests/java/Android.bp
@@ -38,7 +38,6 @@
     sdk_version: "30",
     static_libs: [
         "androidx.test.rules",
-        "repackaged.android.test.base",
         "truth-prebuilt",
         "GameCoreHelper",
     ],

performance_tests/deviceside/Android.bp

diff --git a/performance_tests/deviceside/Android.bp b/performance_tests/deviceside/Android.bp
index a0e6c4f..3e21d59 100644
--- a/performance_tests/deviceside/Android.bp
+++ b/performance_tests/deviceside/Android.bp
@@ -25,7 +25,6 @@
     static_libs: [
         "androidx.test.rules",
         "GameCoreHelper",
-        "repackaged.android.test.base",
     ],
     test_suites: ["device-tests"],
     srcs: ["src/**/*.java"],