diff options
| author | 2022-01-23 09:01:07 +0000 | |
|---|---|---|
| committer | 2022-01-24 13:31:05 +0000 | |
| commit | 18ecf61090cd987e049aadfea6371ea4ca651b06 (patch) | |
| tree | 018b08e85df3f3e5aa56e60b970b3cdd282ca2b8 /java/sdk.go | |
| parent | b62248a6aa3a2ebcb6dc3026994e597d19f90bf8 (diff) | |
Revert^2: "Setting Java 11 as the default version"
Reverted Change: I2f9866deff41406aede24758f6eda5e5808c7f29
Reason for revert: Post-submission failure have been fixed.
Test: presubmit
Bug: 195387473
Change-Id: If5db1614ef455e2f1eae1d36cf514e13e7aab993
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/java/sdk.go b/java/sdk.go index 756a24deb..0dddd40aa 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -55,14 +55,10 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_7 } else if sdk.FinalOrFutureInt() <= 29 { return JAVA_VERSION_8 - } else if ctx.Config().TargetsJava11() { - // Temporary experimental flag to be able to try and build with - // java version 11 options. The flag, if used, just sets Java - // 11 as the default version, leaving any components that - // target an older version intact. - return JAVA_VERSION_11 - } else { + } else if sdk.FinalOrFutureInt() <= 31 { return JAVA_VERSION_9 + } else { + return JAVA_VERSION_11 } } |