summaryrefslogtreecommitdiff
path: root/java/kotlin.go
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2023-04-13 21:51:04 -0700
committerLinux Build Service Account <lnxbuild@localhost>2023-04-13 21:51:04 -0700
commit4993a08b8d37d5075ea0101a09ed9bbde4687ab9 (patch)
tree1afd9af5b30999f16df84fce9e989cd4cc3b3b16 /java/kotlin.go
parenta4427634397d2a145e136bedbf9f66216fc35e73 (diff)
parente63c47c1e746e17332d16c67db7ae0241effb44e (diff)
Merge e63c47c1e746e17332d16c67db7ae0241effb44e on remote branch
Change-Id: I20797bd3da4b2e010c041b3d3cad23cf9094fef8
Diffstat (limited to 'java/kotlin.go')
-rw-r--r--java/kotlin.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/java/kotlin.go b/java/kotlin.go
index 903c6249b..9bff5ea01 100644
--- a/java/kotlin.go
+++ b/java/kotlin.go
@@ -119,9 +119,8 @@ func kotlinCompile(ctx android.ModuleContext, outputFile, headerOutputFile andro
"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",
- "name": kotlinName,
+ "kotlinJvmTarget": flags.javaVersion.StringForKotlinc(),
+ "name": kotlinName,
},
})
}