diff options
| author | Pete Gillin | 2019-05-21 05:19:06 -0500 |
|---|---|---|
| committer | Gerrit Code Review | 2019-05-21 05:19:06 -0500 |
| commit | 3f3a70c0ecb212d9e18e24dd1c31fc196a189eb9 (patch) | |
| tree | 6ea319794acdeb586e1f9dd7f25bd445739a98dc /java | |
| parent | 90b6561d5d2ae198dcabd167727e06e728391b71 (diff) | |
| parent | 9c640141029341d0b604ef17cdc3468cb05fc59b (diff) | |
| download | platform-build-soong-3f3a70c0ecb212d9e18e24dd1c31fc196a189eb9.tar.gz platform-build-soong-3f3a70c0ecb212d9e18e24dd1c31fc196a189eb9.tar.xz platform-build-soong-3f3a70c0ecb212d9e18e24dd1c31fc196a189eb9.zip | |
Merge "Avoid targeting Java 9 for targets with SDK version up to 29."
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 69195c80..060a0070 100644 --- a/java/java.go +++ b/java/java.go | |||
| @@ -854,7 +854,7 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd | |||
| 854 | ret = javaVersion | 854 | ret = javaVersion |
| 855 | } else if ctx.Device() && sdk <= 23 { | 855 | } else if ctx.Device() && sdk <= 23 { |
| 856 | ret = "1.7" | 856 | ret = "1.7" |
| 857 | } else if ctx.Device() && sdk <= 28 || !ctx.Config().TargetOpenJDK9() { | 857 | } else if ctx.Device() && sdk <= 29 || !ctx.Config().TargetOpenJDK9() { |
| 858 | ret = "1.8" | 858 | ret = "1.8" |
| 859 | } else if ctx.Device() && sdkContext.sdkVersion() != "" && sdk == android.FutureApiLevel { | 859 | } else if ctx.Device() && sdkContext.sdkVersion() != "" && sdk == android.FutureApiLevel { |
| 860 | // TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current" | 860 | // TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current" |