Prettify soong ninja build descriptions

Descriptions currently look like:
[  0% 4/29328] cc out-soong/.intermediates/external/clang/lib/Sema/libclangSema/android_arm_armv7-a-neon_denver_static_core/obj/external/clang/lib/Sema/SemaCodeComplete.o

This is not very helpful - most of the characters are used to show the
output path, which contains useful information like target architecture,
but also contains most of the path to the source files twice, and less
useful information like the exact variant name used by soong.
Make the descriptions look like:
[  0% 3/29329] //external/clang/lib/Sema:libclangSema clang++ SemaTemplateInstantiate.cpp

This is //path/to/module:modulename tool relative/path/to/source/file

Test: builds, looks pretty
Change-Id: I3087aa7d4eb1860ef6239d77407b8b35445616d7

3 files changed, 55 insertions, 54 deletions

diff --git a/java/app_builder.go b/java/app_builder.go
index bbd3dac4..55fded57 100644
--- a/java/app_builder.go
+++ b/java/app_builder.go
@@ -34,7 +34,6 @@ var (
 				`-J $javaDir || ( rm -rf "$javaDir/*"; exit 41 ) && ` +
 				`find $javaDir -name "*.java" > $javaFileList`,
 			CommandDeps: []string{"$aaptCmd"},
-			Description: "aapt create R.java $out",
 		},
 		"aaptFlags", "publicResourcesFile", "proguardOptionsFile", "javaDir", "javaFileList")
 
@@ -42,7 +41,6 @@ var (
 		blueprint.RuleParams{
 			Command:     `rm -f $out && $aaptCmd package $aaptFlags -F $out`,
 			CommandDeps: []string{"$aaptCmd"},
-			Description: "aapt export package $out",
 		},
 		"aaptFlags", "publicResourcesFile", "proguardOptionsFile", "javaDir", "javaFileList")
 
@@ -51,7 +49,6 @@ var (
 			// TODO: add-jni-shared-libs-to-package
 			Command:     `cp -f $in $out.tmp && $aaptCmd package -u $aaptFlags -F $out.tmp && mv $out.tmp $out`,
 			CommandDeps: []string{"$aaptCmd"},
-			Description: "aapt package $out",
 		},
 		"aaptFlags")
 
@@ -59,7 +56,6 @@ var (
 		blueprint.RuleParams{
 			Command:     `java -jar $signapkCmd $certificates $in $out`,
 			CommandDeps: []string{"$signapkCmd"},
-			Description: "signapk $out",
 		},
 		"certificates")
 
@@ -68,7 +64,7 @@ var (
 			Command: "java -classpath $androidManifestMergerCmd com.android.manifmerger.Main merge " +
 				"--main $in --libs $libsManifests --out $out",
 			CommandDeps: []string{"$androidManifestMergerCmd"},
-			Description: "merge manifest files $out",
+			Description: "merge manifest files",
 		},
 		"libsManifests")
 )
@@ -87,9 +83,10 @@ func CreateResourceJavaFiles(ctx android.ModuleContext, flags []string,
 	proguardOptionsFile := android.PathForModuleOut(ctx, "proguard.options")
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:      aaptCreateResourceJavaFile,
-		Outputs:   android.WritablePaths{publicResourcesFile, proguardOptionsFile, javaFileList},
-		Implicits: deps,
+		Rule:        aaptCreateResourceJavaFile,
+		Description: "aapt create R.java",
+		Outputs:     android.WritablePaths{publicResourcesFile, proguardOptionsFile, javaFileList},
+		Implicits:   deps,
 		Args: map[string]string{
 			"aaptFlags":           strings.Join(flags, " "),
 			"publicResourcesFile": publicResourcesFile.String(),
@@ -106,9 +103,10 @@ func CreateExportPackage(ctx android.ModuleContext, flags []string, deps android
 	outputFile := android.PathForModuleOut(ctx, "package-export.apk")
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:      aaptCreateAssetsPackage,
-		Output:    outputFile,
-		Implicits: deps,
+		Rule:        aaptCreateAssetsPackage,
+		Description: "aapt export package",
+		Output:      outputFile,
+		Implicits:   deps,
 		Args: map[string]string{
 			"aaptFlags": strings.Join(flags, " "),
 		},
@@ -123,9 +121,10 @@ func CreateAppPackage(ctx android.ModuleContext, flags []string, jarFile android
 	resourceApk := android.PathForModuleOut(ctx, "resources.apk")
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:   aaptAddResources,
-		Output: resourceApk,
-		Input:  jarFile,
+		Rule:        aaptAddResources,
+		Description: "aapt package",
+		Output:      resourceApk,
+		Input:       jarFile,
 		Args: map[string]string{
 			"aaptFlags": strings.Join(flags, " "),
 		},
@@ -139,9 +138,10 @@ func CreateAppPackage(ctx android.ModuleContext, flags []string, jarFile android
 	}
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:   signapk,
-		Output: outputFile,
-		Input:  resourceApk,
+		Rule:        signapk,
+		Description: "signapk",
+		Output:      outputFile,
+		Input:       resourceApk,
 		Args: map[string]string{
 			"certificates": strings.Join(certificateArgs, " "),
 		},
diff --git a/java/builder.go b/java/builder.go
index a9da0fc0..895a9994 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -45,7 +45,6 @@ var (
 				`find $outDir -name "*.class" > $out`,
 			Rspfile:        "$out.rsp",
 			RspfileContent: "$in",
-			Description:    "javac $outDir",
 		},
 		"javacCmd", "javacFlags", "bootClasspath", "classpath", "outDir")
 
@@ -53,7 +52,6 @@ var (
 		blueprint.RuleParams{
 			Command:     `$jarCmd -o $out $jarArgs`,
 			CommandDeps: []string{"$jarCmd"},
-			Description: "jar $out",
 		},
 		"jarCmd", "jarArgs")
 
@@ -63,7 +61,6 @@ var (
 				`$dxCmd --dex --output=$outDir $dxFlags $in || ( rm -rf "$outDir"; exit 41 ) && ` +
 				`find "$outDir" -name "classes*.dex" > $out`,
 			CommandDeps: []string{"$dxCmd"},
-			Description: "dex $out",
 		},
 		"outDir", "dxFlags")
 
@@ -71,7 +68,6 @@ var (
 		blueprint.RuleParams{
 			Command:     "java -jar $jarjarCmd process $rulesFile $in $out",
 			CommandDeps: []string{"$jarjarCmd", "$rulesFile"},
-			Description: "jarjar $out",
 		},
 		"rulesFile")
 
@@ -81,7 +77,6 @@ var (
 				`find $outDir -name "*.class" > $classFile && ` +
 				`find $outDir -type f -a \! -name "*.class" -a \! -name "MANIFEST.MF" > $resourceFile || ` +
 				`(rm -rf $outDir; exit 42)`,
-			Description: "extract java prebuilt $outDir",
 		},
 		"outDir", "classFile", "resourceFile")
 )
@@ -122,10 +117,11 @@ func TransformJavaToClasses(ctx android.ModuleContext, srcFiles android.Paths, s
 	deps = append(deps, srcFileLists...)
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:      javac,
-		Output:    classFileList,
-		Inputs:    srcFiles,
-		Implicits: deps,
+		Rule:        javac,
+		Description: "javac",
+		Output:      classFileList,
+		Inputs:      srcFiles,
+		Implicits:   deps,
 		Args: map[string]string{
 			"javacFlags":    javacFlags,
 			"bootClasspath": flags.bootClasspath,
@@ -156,9 +152,10 @@ func TransformClassesToJar(ctx android.ModuleContext, classes []jarSpec,
 	}
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:      jar,
-		Output:    outputFile,
-		Implicits: deps,
+		Rule:        jar,
+		Description: "jar",
+		Output:      outputFile,
+		Implicits:   deps,
 		Args: map[string]string{
 			"jarArgs": strings.Join(jarArgs, " "),
 		},
@@ -174,9 +171,10 @@ func TransformClassesJarToDex(ctx android.ModuleContext, classesJar android.Path
 	outputFile := android.PathForModuleOut(ctx, "dex.filelist")
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:   dx,
-		Output: outputFile,
-		Input:  classesJar,
+		Rule:        dx,
+		Description: "dx",
+		Output:      outputFile,
+		Input:       classesJar,
 		Args: map[string]string{
 			"dxFlags": flags.dxFlags,
 			"outDir":  outDir.String(),
@@ -202,9 +200,10 @@ func TransformDexToJavaLib(ctx android.ModuleContext, resources []jarSpec,
 	jarArgs = append(jarArgs, dexJarSpec.soongJarArgs())
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:      jar,
-		Output:    outputFile,
-		Implicits: deps,
+		Rule:        jar,
+		Description: "jar",
+		Output:      outputFile,
+		Implicits:   deps,
 		Args: map[string]string{
 			"jarArgs": strings.Join(jarArgs, " "),
 		},
@@ -216,10 +215,11 @@ func TransformDexToJavaLib(ctx android.ModuleContext, resources []jarSpec,
 func TransformJarJar(ctx android.ModuleContext, classesJar android.Path, rulesFile android.Path) android.Path {
 	outputFile := android.PathForModuleOut(ctx, "classes-jarjar.jar")
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:     jarjar,
-		Output:   outputFile,
-		Input:    classesJar,
-		Implicit: rulesFile,
+		Rule:        jarjar,
+		Description: "jarjar",
+		Output:      outputFile,
+		Input:       classesJar,
+		Implicit:    rulesFile,
 		Args: map[string]string{
 			"rulesFile": rulesFile.String(),
 		},
@@ -236,9 +236,10 @@ func TransformPrebuiltJarToClasses(ctx android.ModuleContext,
 	resourceFileList := android.PathForModuleOut(ctx, "extracted/resources.list")
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:    extractPrebuilt,
-		Outputs: android.WritablePaths{classFileList, resourceFileList},
-		Input:   prebuilt,
+		Rule:        extractPrebuilt,
+		Description: "extract classes",
+		Outputs:     android.WritablePaths{classFileList, resourceFileList},
+		Input:       prebuilt,
 		Args: map[string]string{
 			"outDir":       classDir.String(),
 			"classFile":    classFileList.String(),
diff --git a/java/gen.go b/java/gen.go
index 06247085..e3973bf8 100644
--- a/java/gen.go
+++ b/java/gen.go
@@ -37,7 +37,6 @@ var (
 		blueprint.RuleParams{
 			Command:     "$aidlCmd -d$depFile $aidlFlags $in $out",
 			CommandDeps: []string{"$aidlCmd"},
-			Description: "aidl $out",
 		},
 		"depFile", "aidlFlags")
 
@@ -45,14 +44,12 @@ var (
 		blueprint.RuleParams{
 			Command:     "$logtagsCmd -o $out $in $allLogtagsFile",
 			CommandDeps: []string{"$logtagsCmd"},
-			Description: "logtags $out",
 		})
 
 	mergeLogtags = pctx.AndroidStaticRule("mergeLogtags",
 		blueprint.RuleParams{
 			Command:     "$mergeLogtagsCmd -o $out $in",
 			CommandDeps: []string{"$mergeLogtagsCmd"},
-			Description: "merge logtags $out",
 		})
 )
 
@@ -61,9 +58,10 @@ func genAidl(ctx android.ModuleContext, aidlFile android.Path, aidlFlags string)
 	depFile := javaFile.String() + ".d"
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:   aidl,
-		Output: javaFile,
-		Input:  aidlFile,
+		Rule:        aidl,
+		Description: "aidl " + aidlFile.Rel(),
+		Output:      javaFile,
+		Input:       aidlFile,
 		Args: map[string]string{
 			"depFile":   depFile,
 			"aidlFlags": aidlFlags,
@@ -77,9 +75,10 @@ func genLogtags(ctx android.ModuleContext, logtagsFile android.Path) android.Pat
 	javaFile := android.GenPathWithExt(ctx, "logtags", logtagsFile, "java")
 
 	ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-		Rule:   logtags,
-		Output: javaFile,
-		Input:  logtagsFile,
+		Rule:        logtags,
+		Description: "logtags " + logtagsFile.Rel(),
+		Output:      javaFile,
+		Input:       logtagsFile,
 	})
 
 	return javaFile
@@ -122,8 +121,9 @@ func (l *logtagsSingleton) GenerateBuildActions(ctx blueprint.SingletonContext)
 	})
 
 	ctx.Build(pctx, blueprint.BuildParams{
-		Rule:    mergeLogtags,
-		Outputs: []string{"$allLogtagsFile"},
-		Inputs:  allLogtags.Strings(),
+		Rule:        mergeLogtags,
+		Description: "merge logtags",
+		Outputs:     []string{"$allLogtagsFile"},
+		Inputs:      allLogtags.Strings(),
 	})
 }