diff options
| author | Colin Cross <ccross@android.com> | 2019-04-09 15:29:41 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-11 23:03:23 +0000 |
| commit | df8eebecaa72ccae676a002ca5224f0ca99d46be (patch) | |
| tree | e1d34b377754e18b1fa7030bdd0239ddf801cdc2 /java/kotlin.go | |
| parent | b10243dc4eebd82bbf907da4937b72c1c15cf03f (diff) | |
Zip boot image
Create a zip file containing the zipped boot image files.
Test: m out/soong/sailfish/dex_bootjars/boot.zip
Change-Id: I1b08c9aca962a5999585cbe9e665693ef4558524
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/kotlin.go b/java/kotlin.go index 054998f04..54c6b0ee6 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -27,11 +27,12 @@ import ( var kotlinc = pctx.AndroidGomaStaticRule("kotlinc", blueprint.RuleParams{ - Command: `rm -rf "$classesDir" "$srcJarDir" "$kotlinBuildFile" && mkdir -p "$classesDir" "$srcJarDir" && ` + + Command: `rm -rf "$classesDir" "$srcJarDir" "$kotlinBuildFile" "$emptyDir" && ` + + `mkdir -p "$classesDir" "$srcJarDir" "$emptyDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `${config.GenKotlinBuildFileCmd} $classpath $classesDir $out.rsp $srcJarDir/list > $kotlinBuildFile &&` + `${config.KotlincCmd} ${config.JavacHeapFlags} $kotlincFlags ` + - `-jvm-target $kotlinJvmTarget -Xbuild-file=$kotlinBuildFile && ` + + `-jvm-target $kotlinJvmTarget -Xbuild-file=$kotlinBuildFile -kotlin-home $emptyDir && ` + `${config.SoongZipCmd} -jar -o $out -C $classesDir -D $classesDir && ` + `rm -rf "$srcJarDir"`, CommandDeps: []string{ @@ -49,7 +50,7 @@ var kotlinc = pctx.AndroidGomaStaticRule("kotlinc", Rspfile: "$out.rsp", RspfileContent: `$in`, }, - "kotlincFlags", "classpath", "srcJars", "srcJarDir", "classesDir", "kotlinJvmTarget", "kotlinBuildFile") + "kotlincFlags", "classpath", "srcJars", "srcJarDir", "classesDir", "kotlinJvmTarget", "kotlinBuildFile", "emptyDir") // kotlinCompile takes .java and .kt sources and srcJars, and compiles the .kt sources into a classes jar in outputFile. func kotlinCompile(ctx android.ModuleContext, outputFile android.WritablePath, @@ -73,6 +74,7 @@ func kotlinCompile(ctx android.ModuleContext, outputFile android.WritablePath, "classesDir": android.PathForModuleOut(ctx, "kotlinc", "classes").String(), "srcJarDir": android.PathForModuleOut(ctx, "kotlinc", "srcJars").String(), "kotlinBuildFile": android.PathForModuleOut(ctx, "kotlinc-build.xml").String(), + "emptyDir": android.PathForModuleOut(ctx, "kotlinc", "empty").String(), // http://b/69160377 kotlinc only supports -jvm-target 1.6 and 1.8 "kotlinJvmTarget": "1.8", }, |