summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2024-09-05 21:07:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-05 21:07:40 +0000
commit392aae7702d17759ddb74a5e293e09e546836abc (patch)
tree44e2b890211703db7b9fd16eff50aa9c9f4d204a /java/java.go
parentddb9f16c2c8f869a42b9770b010939bc9d5b4e3d (diff)
parent151446cb41b541948a49cadfec5b0f17c0a44fe6 (diff)
Merge "Remove obsolete robolectric test runner integration" into main am: 151446cb41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3254252 Change-Id: Ib1d5f7a2fa7491e1ecbb4873513c182d309275f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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.