StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up srcjar directories after each rule

Browse Source 
The srcjar directories just confuse people looking for generated
files, clean them up after each rule.

Test: m checkbuild
Change-Id: If712ce7d4922619fd8420ae8f89830fe7824114d
This commit is contained in:
Colin Cross
2019-01-24 16:36:57 -08:00
parent 39c1679e69
commit 44c29a8fe1
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/builder.go
View File

@@ -47,7 +47,8 @@ var (
`$processorpath $processor $javacFlags $bootClasspath $classpath ` + `$processorpath $processor $javacFlags $bootClasspath $classpath ` +
`-source $javaVersion -target $javaVersion ` + `-source $javaVersion -target $javaVersion ` +
`-d $outDir -s $annoDir @$out.rsp @$srcJarDir/list ; fi ) && ` + `-d $outDir -s $annoDir @$out.rsp @$srcJarDir/list ; fi ) && ` +
`${config.SoongZipCmd} -jar -o $out -C $outDir -D $outDir`, `${config.SoongZipCmd} -jar -o $out -C $outDir -D $outDir && ` +
`rm -rf "$srcJarDir"`,
CommandDeps: []string{ CommandDeps: []string{
"${config.JavacCmd}", "${config.JavacCmd}",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",

12
java/droiddoc.go
View File

@@ -34,7 +34,9 @@ var (
`$opts $bootclasspathArgs $classpathArgs $sourcepathArgs ` + `$opts $bootclasspathArgs $classpathArgs $sourcepathArgs ` +
`-d $outDir -quiet && ` + `-d $outDir -quiet && ` +
`${config.SoongZipCmd} -write_if_changed -d -o $docZip -C $outDir -D $outDir && ` + `${config.SoongZipCmd} -write_if_changed -d -o $docZip -C $outDir -D $outDir && ` +
`${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir $postDoclavaCmds`, `${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir $postDoclavaCmds && ` +
`rm -rf "$srcJarDir"`,
CommandDeps: []string{ CommandDeps: []string{
"${config.ZipSyncCmd}", "${config.ZipSyncCmd}",
"${config.JavadocCmd}", "${config.JavadocCmd}",
@@ -74,7 +76,8 @@ var (
`${config.JavaCmd} -jar ${config.MetalavaJar} -encoding UTF-8 -source $javaVersion @$out.rsp @$srcJarDir/list ` + `${config.JavaCmd} -jar ${config.MetalavaJar} -encoding UTF-8 -source $javaVersion @$out.rsp @$srcJarDir/list ` +
`$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet --format=v2 ` + `$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet --format=v2 ` +
`$opts && ` + `$opts && ` +
`${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir`, `${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir && ` +
`rm -rf "$srcJarDir"`,
CommandDeps: []string{ CommandDeps: []string{
"${config.ZipSyncCmd}", "${config.ZipSyncCmd}",
"${config.JavaCmd}", "${config.JavaCmd}",
@@ -94,7 +97,7 @@ var (
`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +
`${config.JavaCmd} -jar ${config.MetalavaJar} -encoding UTF-8 -source $javaVersion @$out.rsp @$srcJarDir/list ` + `${config.JavaCmd} -jar ${config.MetalavaJar} -encoding UTF-8 -source $javaVersion @$out.rsp @$srcJarDir/list ` +
`$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet --format=v2 ` + `$bootclasspathArgs $classpathArgs $sourcepathArgs --no-banner --color --quiet --format=v2 ` +
`$opts && touch $out ) || ` + `$opts && touch $out && rm -rf "$srcJarDir") || ` +
`( echo -e "$msg" ; exit 38 )`, `( echo -e "$msg" ; exit 38 )`,
CommandDeps: []string{ CommandDeps: []string{
"${config.ZipSyncCmd}", "${config.ZipSyncCmd}",
@@ -120,7 +123,8 @@ var (
`${config.JavaCmd} -jar ${config.DokkaJar} $srcJarDir ` + `${config.JavaCmd} -jar ${config.DokkaJar} $srcJarDir ` +
`$classpathArgs -format dac -dacRoot /reference/kotlin -output $outDir $opts && ` + `$classpathArgs -format dac -dacRoot /reference/kotlin -output $outDir $opts && ` +
`${config.SoongZipCmd} -write_if_changed -d -o $docZip -C $outDir -D $outDir && ` + `${config.SoongZipCmd} -write_if_changed -d -o $docZip -C $outDir -D $outDir && ` +
`${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir`, `${config.SoongZipCmd} -write_if_changed -jar -o $out -C $stubsDir -D $stubsDir && ` +
`rm -rf "$srcJarDir"`,
CommandDeps: []string{ CommandDeps: []string{
"${config.ZipSyncCmd}", "${config.ZipSyncCmd}",
"${config.DokkaJar}", "${config.DokkaJar}",

6
java/kotlin.go
View File

@@ -32,7 +32,8 @@ var kotlinc = pctx.AndroidGomaStaticRule("kotlinc",
`${config.GenKotlinBuildFileCmd} $classpath $classesDir $out.rsp $srcJarDir/list > $kotlinBuildFile &&` + `${config.GenKotlinBuildFileCmd} $classpath $classesDir $out.rsp $srcJarDir/list > $kotlinBuildFile &&` +
`${config.KotlincCmd} ${config.JavacHeapFlags} $kotlincFlags ` + `${config.KotlincCmd} ${config.JavacHeapFlags} $kotlincFlags ` +
`-jvm-target $kotlinJvmTarget -Xbuild-file=$kotlinBuildFile && ` + `-jvm-target $kotlinJvmTarget -Xbuild-file=$kotlinBuildFile && ` +
`${config.SoongZipCmd} -jar -o $out -C $classesDir -D $classesDir`, `${config.SoongZipCmd} -jar -o $out -C $classesDir -D $classesDir && ` +
`rm -rf "$srcJarDir"`,
CommandDeps: []string{ CommandDeps: []string{
"${config.KotlincCmd}", "${config.KotlincCmd}",
"${config.KotlinCompilerJar}", "${config.KotlinCompilerJar}",
@@ -89,7 +90,8 @@ var kapt = pctx.AndroidGomaStaticRule("kapt",
`$kaptProcessorPath ` + `$kaptProcessorPath ` +
`$kaptProcessor ` + `$kaptProcessor ` +
`-Xbuild-file=$kotlinBuildFile && ` + `-Xbuild-file=$kotlinBuildFile && ` +
`${config.SoongZipCmd} -jar -o $out -C $kaptDir/sources -D $kaptDir/sources`, `${config.SoongZipCmd} -jar -o $out -C $kaptDir/sources -D $kaptDir/sources && ` +
`rm -rf "$srcJarDir"`,
CommandDeps: []string{ CommandDeps: []string{
"${config.KotlincCmd}", "${config.KotlincCmd}",
"${config.KotlinCompilerJar}", "${config.KotlinCompilerJar}",