diff --git a/java/builder.go b/java/builder.go
index 193dfe7..573c877 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -181,7 +181,7 @@
 	inputs := append(android.Paths(nil), srcFiles...)
 	inputs = append(inputs, srcJars...)
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        kotlinc,
 		Description: "kotlinc",
 		Output:      outputFile,
@@ -236,7 +236,7 @@
 	} else {
 		sourcepath = ""
 	}
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        turbine,
 		Description: "turbine",
 		Output:      outputFile,
@@ -286,7 +286,7 @@
 
 	deps = append(deps, flags.classpath...)
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        rule,
 		Description: desc,
 		Output:      outputFile,
@@ -309,7 +309,7 @@
 func TransformResourcesToJar(ctx android.ModuleContext, outputFile android.WritablePath,
 	jarArgs []string, deps android.Paths) {
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        jar,
 		Description: "jar",
 		Output:      outputFile,
@@ -341,7 +341,7 @@
 		jarArgs = append(jarArgs, "-D")
 	}
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        combineJar,
 		Description: desc,
 		Output:      outputFile,
@@ -371,7 +371,7 @@
 	deps = append(deps, flags.bootClasspath...)
 	deps = append(deps, flags.classpath...)
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        desugar,
 		Description: "desugar",
 		Output:      outputFile,
@@ -393,7 +393,7 @@
 
 	outDir := android.PathForModuleOut(ctx, "dex")
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        dx,
 		Description: "dx",
 		Output:      outputFile,
@@ -407,7 +407,7 @@
 
 func TransformJarJar(ctx android.ModuleContext, outputFile android.WritablePath,
 	classesJar android.Path, rulesFile android.Path) {
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        jarjar,
 		Description: "jarjar",
 		Output:      outputFile,
