summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2024-10-10 22:32:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-10-10 22:32:21 +0000
commit004074db579a9e1abf07fe4c45f35d4d5247cac0 (patch)
treed92460b53feb6abc37aa85cf755dc35631208937 /java/java.go
parentfef73af257e936d9b6345ce30ad528c28bbccb98 (diff)
parent8a9628098bbed62f3af13021b434238308adc7c1 (diff)
Merge changes from topic "remove-non-parallel-mutator" into main
* changes: Remove MutatorHandle.Parallel() Fix TestFinalDepsPhase for parallel mutator
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 d97288768..0b48873f6 100644
--- a/java/java.go
+++ b/java/java.go
@@ -70,9 +70,9 @@ func registerJavaBuildComponents(ctx android.RegistrationContext) {
// established, to not get the dependencies split into the wrong variants and
// to support the checks in dexpreoptDisabled().
ctx.FinalDepsMutators(func(ctx android.RegisterMutatorsContext) {
- ctx.BottomUp("dexpreopt_tool_deps", dexpreoptToolDepsMutator).Parallel()
+ ctx.BottomUp("dexpreopt_tool_deps", dexpreoptToolDepsMutator)
// needs access to ApexInfoProvider which is available after variant creation
- ctx.BottomUp("jacoco_deps", jacocoDepsMutator).Parallel()
+ ctx.BottomUp("jacoco_deps", jacocoDepsMutator)
})
ctx.RegisterParallelSingletonType("kythe_java_extract", kytheExtractJavaFactory)