diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/aar.go | 2 | ||||
| -rw-r--r-- | java/app_builder.go | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/java/aar.go b/java/aar.go index a108ba05..d08e4876 100644 --- a/java/aar.go +++ b/java/aar.go @@ -332,7 +332,7 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) a.Module.compile(ctx, a.aaptSrcJar) - a.aarFile = android.PathForOutput(ctx, ctx.ModuleName()+".aar") + a.aarFile = android.PathForModuleOut(ctx, ctx.ModuleName()+".aar") var res android.Paths if a.androidLibraryProperties.BuildAAR { BuildAAR(ctx, a.aarFile, a.outputFile, a.manifestPath, a.rTxt, res) diff --git a/java/app_builder.go b/java/app_builder.go index 28fc4c49..5b999d83 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -122,9 +122,10 @@ func BuildAAR(ctx android.ModuleContext, outputFile android.WritablePath, } ctx.Build(pctx, android.BuildParams{ - Rule: buildAAR, - Implicits: deps, - Output: outputFile, + Rule: buildAAR, + Description: "aar", + Implicits: deps, + Output: outputFile, Args: map[string]string{ "manifest": manifest.String(), "classesJar": classesJarPath, |