Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d96eebf3 authored by Cole Faust's avatar Cole Faust
Browse files

Use the current java version for -jvm-target 

This is a partial revert of aosp/541879.
In that cl, the kotlin jvm version was always
set to 1.8 because that's what the kotlin
complier supported at the time, but now
it supports more versions:

$ ./external/kotlinc/bin/kotlinc -jvm-target foo
error: unknown JVM target version: foo
Supported versions: 1.6, 1.8, 9, 10, 11, 12, 13, 14, 15, 16, 17

Bug: 69160377
Bug: 236431222
Test: Treehugger
Change-Id: I273e0b4d1f484013889e17c60bc1b299a3f975a1
parent 2bce04f7

java/java.go

+14 −0
Original line number Original line Diff line number Diff line
@@ -510,6 +510,20 @@ func (v javaVersion) String() string { 
	}

	}

}

}





func (v javaVersion) StringForKotlinc() string {

	// $ ./external/kotlinc/bin/kotlinc -jvm-target foo

	// error: unknown JVM target version: foo

	// Supported versions: 1.6, 1.8, 9, 10, 11, 12, 13, 14, 15, 16, 17

	switch v {

	case JAVA_VERSION_7:

		return "1.6"

	case JAVA_VERSION_9:

		return "9"

	default:

		return v.String()

	}

}



// Returns true if javac targeting this version uses system modules instead of a bootclasspath.

// Returns true if javac targeting this version uses system modules instead of a bootclasspath.

func (v javaVersion) usesJavaModules() bool {

func (v javaVersion) usesJavaModules() bool {

	return v >= 9

	return v >= 9

java/kotlin.go

+2 −3
Original line number Original line Diff line number Diff line
@@ -119,8 +119,7 @@ func kotlinCompile(ctx android.ModuleContext, outputFile, headerOutputFile andro 
			"srcJarDir":         android.PathForModuleOut(ctx, "kotlinc", "srcJars").String(),

			"srcJarDir":         android.PathForModuleOut(ctx, "kotlinc", "srcJars").String(),

			"kotlinBuildFile":   android.PathForModuleOut(ctx, "kotlinc-build.xml").String(),

			"kotlinBuildFile":   android.PathForModuleOut(ctx, "kotlinc-build.xml").String(),

			"emptyDir":          android.PathForModuleOut(ctx, "kotlinc", "empty").String(),

			"emptyDir":          android.PathForModuleOut(ctx, "kotlinc", "empty").String(),

			// http://b/69160377 kotlinc only supports -jvm-target 1.6 and 1.8

			"kotlinJvmTarget":   flags.javaVersion.StringForKotlinc(),

			"kotlinJvmTarget": "1.8",

			"name":              kotlinName,

			"name":              kotlinName,

		},

		},

	})

	})