diff --git a/java/app_builder.go b/java/app_builder.go
index 55fded5..ed7abce 100644
--- a/java/app_builder.go
+++ b/java/app_builder.go
@@ -82,7 +82,7 @@
 	publicResourcesFile := android.PathForModuleOut(ctx, "public_resources.xml")
 	proguardOptionsFile := android.PathForModuleOut(ctx, "proguard.options")
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        aaptCreateResourceJavaFile,
 		Description: "aapt create R.java",
 		Outputs:     android.WritablePaths{publicResourcesFile, proguardOptionsFile, javaFileList},
@@ -102,7 +102,7 @@
 func CreateExportPackage(ctx android.ModuleContext, flags []string, deps android.Paths) android.ModuleOutPath {
 	outputFile := android.PathForModuleOut(ctx, "package-export.apk")
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        aaptCreateAssetsPackage,
 		Description: "aapt export package",
 		Output:      outputFile,
@@ -120,7 +120,7 @@
 
 	resourceApk := android.PathForModuleOut(ctx, "resources.apk")
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        aaptAddResources,
 		Description: "aapt package",
 		Output:      resourceApk,
@@ -137,7 +137,7 @@
 		certificateArgs = append(certificateArgs, c+".x509.pem", c+".pk8")
 	}
 
-	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
+	ctx.Build(pctx, android.BuildParams{
 		Rule:        signapk,
 		Description: "signapk",
 		Output:      outputFile,
