diff options
| author | 2021-12-01 22:18:41 +0000 | |
|---|---|---|
| committer | 2021-12-01 22:18:41 +0000 | |
| commit | 5e4637dc1b7a1322ae701de15d3e466a4492b98a (patch) | |
| tree | dce1e43a3080ccacccc03bd18a4cfa28194c79e8 /java/java.go | |
| parent | 7c8497dc360e7c8631b0ceb38c18c0035894a3df (diff) | |
| parent | c0244da203d8c1d98cae4f73cda4f1489f7e5650 (diff) | |
Merge "Adding configuration support for Java 11"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 2f9e03a80..ee1fd8ad3 100644 --- a/java/java.go +++ b/java/java.go @@ -447,6 +447,7 @@ const ( JAVA_VERSION_7 = 7 JAVA_VERSION_8 = 8 JAVA_VERSION_9 = 9 + JAVA_VERSION_11 = 11 ) func (v javaVersion) String() string { @@ -459,6 +460,8 @@ func (v javaVersion) String() string { return "1.8" case JAVA_VERSION_9: return "1.9" + case JAVA_VERSION_11: + return "11" default: return "unsupported" } @@ -479,8 +482,10 @@ func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) jav return JAVA_VERSION_8 case "1.9", "9": return JAVA_VERSION_9 - case "10", "11": - ctx.PropertyErrorf("java_version", "Java language levels above 9 are not supported") + case "11": + return JAVA_VERSION_11 + case "10": + ctx.PropertyErrorf("java_version", "Java language levels 10 is not supported") return JAVA_VERSION_UNSUPPORTED default: ctx.PropertyErrorf("java_version", "Unrecognized Java language level") |