summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2024-08-23 11:58:08 -0700
committer Colin Cross <ccross@android.com> 2024-09-04 15:47:11 -0700
commitfdaa672ad1faacf0fb279adf876841dc2ffb404e (patch)
tree865c1831ad841e4d8f07e54b1b84b1a9886e5a26 /java/java.go
parentc55b25f125093f9f8257b7649a0b6cb8127d0646 (diff)
Remove obsolete robolectric test runner integration
The `m Run*RoboTests` test runner is no longer supported, remove the code to generate the Make rules for it. Also reduce the number of combining steps by passing the extra jars that need to be combined into the compile step. This relands Icf05079bf570bed7a10962cbf03459bd53c51f99 with a fix to reorder the instrumented app classes after dependency classes. Test: atest --host SystemUiRoboTests Flag: EXEMPT refactor Change-Id: I174ceb95af5557e1859eeb12a2f5fac2332975a8
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go
index 8cc108541..f30d892b7 100644
--- a/java/java.go
+++ b/java/java.go
@@ -553,7 +553,7 @@ type deps struct {
// are provided by systemModules.
java9Classpath classpath
- processorPath classpath
+ processorPath classpath ``
errorProneProcessorPath classpath
processorClasses []string
staticJars android.Paths
@@ -980,7 +980,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.dexpreopter.disableDexpreopt()
}
}
- j.compile(ctx, nil, nil, nil)
+ j.compile(ctx, nil, nil, nil, nil)
// If this module is an impl library created from java_sdk_library,
// install the files under the java_sdk_library module outdir instead of this module outdir.