diff options
| author | Colin Cross <ccross@android.com> | 2019-01-24 16:36:57 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-01-25 00:53:05 +0000 |
| commit | 44c29a8fe1a7c101b9ed00b1b0882184860dfd6e (patch) | |
| tree | c2f0f6ce27828e9b51923c915dbd1ad0509c2375 /java/kotlin.go | |
| parent | 39c1679e693af409eb4ea44c2a8aa4b93ea25b46 (diff) | |
Clean up srcjar directories after each rule
The srcjar directories just confuse people looking for generated
files, clean them up after each rule.
Test: m checkbuild
Change-Id: If712ce7d4922619fd8420ae8f89830fe7824114d
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/kotlin.go b/java/kotlin.go index 9c47f98a7..81b89f96f 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -32,7 +32,8 @@ var kotlinc = pctx.AndroidGomaStaticRule("kotlinc", `${config.GenKotlinBuildFileCmd} $classpath $classesDir $out.rsp $srcJarDir/list > $kotlinBuildFile &&` + `${config.KotlincCmd} ${config.JavacHeapFlags} $kotlincFlags ` + `-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{ "${config.KotlincCmd}", "${config.KotlinCompilerJar}", @@ -89,7 +90,8 @@ var kapt = pctx.AndroidGomaStaticRule("kapt", `$kaptProcessorPath ` + `$kaptProcessor ` + `-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{ "${config.KotlincCmd}", "${config.KotlinCompilerJar}", |