Remove repackaged.android.test.mock
The repackaged.android.test.mock uses internal APIs so cannot be built
against the SDK which means that anything that depends on it cannot
guarantee to run if those internal APIs change.
That library was built because the classes in
repackaged.android.test.runner depend on them. However, the
repackaged.android.test.runner library is only used by the
cts-api-signature-test target and it does not use any android.test.mock
classes directly, or indirectly. Therefore, this simply excludes any
classes from repackaged.android.test.runner that depend on
android.test.mock classes so that repackaged.android.test.mock can be
removed altogether.
Bug: 69899800
Bug: 30188076
Test: make checkbuild
Change-Id: If4528e6a4ec2b08faffd6d413672c5004d85e0a9
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 54e07a16..bb07363 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -19,7 +19,6 @@
java_library {
name: "android.test.mock",
- // Needs to be consistent with the repackaged version of this make target.
java_version: "1.8",
srcs: ["src/**/*.java"],
@@ -28,15 +27,3 @@
"framework",
],
}
-
-// Build the repackaged.android.test.mock library
-// ==============================================
-java_library_static {
- name: "repackaged.android.test.mock",
-
- static_libs: ["android.test.mock"],
-
- jarjar_rules: "jarjar-rules.txt",
- // Pin java_version until jarjar is certified to support later versions. http://b/72703434
- java_version: "1.8",
-}
diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index c69279b..1cce2c3c 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -24,7 +24,7 @@
srcs: ["src/**/*.java"],
errorprone: {
- javacflags: ["-Xep:DepAnn:ERROR"],
+ javacflags: ["-Xep:DepAnn:ERROR"],
},
sdk_version: "current",
@@ -56,8 +56,21 @@
java_library_static {
name: "repackaged.android.test.runner",
+ srcs: ["src/**/*.java"],
+ exclude_srcs: [
+ "src/android/test/ActivityUnitTestCase.java",
+ "src/android/test/ApplicationTestCase.java",
+ "src/android/test/IsolatedContext.java",
+ "src/android/test/ProviderTestCase.java",
+ "src/android/test/ProviderTestCase2.java",
+ "src/android/test/RenamingDelegatingContext.java",
+ "src/android/test/ServiceTestCase.java",
+ ],
+
sdk_version: "current",
- static_libs: ["android.test.runner"],
+ libs: [
+ "android.test.base",
+ ],
jarjar_rules: "jarjar-rules.txt",
// Pin java_version until jarjar is certified to support later versions. http://b/72703434
