Merge "Adding experimental option to target Java 11"

1 files changed, 6 insertions, 0 deletions

diff --git a/java/sdk.go b/java/sdk.go
index e6bf220b4..de7070eef 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -55,6 +55,12 @@ 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().IsEnvTrue("EXPERIMENTAL_TARGET_JAVA_VERSION_11") {
+		// 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
 	}