diff options
| author | Matt Lee <matthewhlee@google.com> | 2023-03-02 14:23:51 -0800 |
|---|---|---|
| committer | Matt Lee <matthewhlee@google.com> | 2023-03-02 14:23:51 -0800 |
| commit | ee181be03f0da2d752b6b31d4c698026b41c7f44 (patch) | |
| tree | 1afd9af5b30999f16df84fce9e989cd4cc3b3b16 /java/kotlin.go | |
| parent | 616151ebbfbae6bb1f9cab420e5f3cfb27d71a21 (diff) | |
| parent | ab123c3736ddaae9eb1230fb2310cccac81625f0 (diff) | |
Merge t-qpr-2023-03
Change-Id: I61ec429dddae7971efe2a62fd5f1c173a896ee15
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 5 |
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, }, }) } |