From 1e7438524b7e28c5f58c6ab380a53777c221dc70 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 28 Oct 2019 11:37:20 -0700
Subject: Make javaVersion an enum

Remove the hardcoded checks against "1.9" by making javaVersion
an enum and implementing javaVersion.usesJavaModules().

Test: TestClasspath
Change-Id: I559eeb1f45880bb8177269c6d977ee4dfbadce57
---
 java/kotlin.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/kotlin.go')

diff --git a/java/kotlin.go b/java/kotlin.go
index 83069072c..f8ae229de 100644
--- a/java/kotlin.go
+++ b/java/kotlin.go
@@ -141,8 +141,8 @@ func kotlinKapt(ctx android.ModuleContext, outputFile android.WritablePath,
 	}
 
 	encodedJavacFlags := kaptEncodeFlags([][2]string{
-		{"-source", flags.javaVersion},
-		{"-target", flags.javaVersion},
+		{"-source", flags.javaVersion.String()},
+		{"-target", flags.javaVersion.String()},
 	})
 
 	kotlinName := filepath.Join(ctx.ModuleDir(), ctx.ModuleSubDir(), ctx.ModuleName())
-- 
cgit v1.2.3-59-g8ed1b