diff options
| author | 2022-01-20 15:21:51 +0000 | |
|---|---|---|
| committer | 2022-01-20 15:37:11 +0000 | |
| commit | 8d3e0bb25edd55f296c0d361868e223ddbaec587 (patch) | |
| tree | 44e4a6e9b1e59b3642c4aa49a3aa7dbc32dab3c6 /java/sdk.go | |
| parent | 171c2103b89d38179119decea1be442015009caf (diff) | |
Revert "Setting Java 11 as the default version"
Revert submission 1944928-default-java11
Reason for revert: Post-submit failures
Reverted Changes:
Ia9a0aa2a4:Setting Java 11 as the default version
Ibf5d10521:Setting Java 11 as the default version
Fixes: 215504708
Fixes: 215502091
Fixes: 215502091
Change-Id: I2f9866deff41406aede24758f6eda5e5808c7f29
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/sdk.go b/java/sdk.go index 0dddd40aa..756a24deb 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -55,10 +55,14 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe return JAVA_VERSION_7 } else if sdk.FinalOrFutureInt() <= 29 { return JAVA_VERSION_8 - } else if sdk.FinalOrFutureInt() <= 31 { - return JAVA_VERSION_9 - } else { + } 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 { + return JAVA_VERSION_9 } } |