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
diff --git a/java/java.go b/java/java.go
index bb7c32b..e3e9721 100644
--- a/java/java.go
+++ b/java/java.go
@@ -450,14 +450,8 @@
return normalizeJavaVersion(ctx, javaVersion)
} else if ctx.Device() {
return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx))
- } 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
+ return JAVA_VERSION_11
}
}