diff options
| author | 2019-10-17 14:52:07 +0100 | |
|---|---|---|
| committer | 2019-10-25 16:55:06 +0100 | |
| commit | a1c9e9da550e9b72a7ed9a442f98ece25650d5dc (patch) | |
| tree | a66b0885408607fad17e45bfa04929738baeb251 /java/config/makevars.go | |
| parent | e1955918296b6475ef2338354e281d31ccb32297 (diff) | |
Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9.
Prior to this change, setting that to "false" turned the default Java
language level back to 8. This change removes that option.
Bug: 115604102
Test: m java droid docs tests cts
Change-Id: I97bfd0dc8d941008b4071c6efe1c0c24950c4f1f
Diffstat (limited to 'java/config/makevars.go')
| -rw-r--r-- | java/config/makevars.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/java/config/makevars.go b/java/config/makevars.go index 2fa6f8969..981a73638 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -29,12 +29,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES", strings.Join(DefaultBootclasspathLibraries, " ")) ctx.Strict("DEFAULT_SYSTEM_MODULES", DefaultSystemModules) - if ctx.Config().TargetOpenJDK9() { - ctx.Strict("DEFAULT_JAVA_LANGUAGE_VERSION", "1.9") - } else { - ctx.Strict("DEFAULT_JAVA_LANGUAGE_VERSION", "1.8") - } - ctx.Strict("ANDROID_JAVA_HOME", "${JavaHome}") ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}") ctx.Strict("ANDROID_JAVA9_HOME", "prebuilts/jdk/jdk9/${hostPrebuiltTag}") |