From 7ca467854e5f7dea47f6376086b97ab2f994e438 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Mon, 25 Jun 2018 13:00:25 -0700 Subject: [PATCH] Override javaVersion for Doclava when EXPERIMENTAL_USE_OPENJDK9=true Test: N/A Bug: 110786923 Change-Id: I6d1f808e97aad2fe3206f52c8fc93c87b61fdb64 --- java/droiddoc.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/droiddoc.go b/java/droiddoc.go index 9821bcf2e..e0e8612fe 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -640,6 +640,12 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { var bootClasspathArgs string javaVersion := getJavaVersion(ctx, String(d.Javadoc.properties.Java_version), String(d.Javadoc.properties.Sdk_version)) + // Doclava has problem with "-source 1.9", so override javaVersion when Doclava + // is running with EXPERIMENTAL_USE_OPENJDK9=true. And eventually Doclava will be + // replaced by Metalava. + if !Bool(d.properties.Metalava_enabled) { + javaVersion = "1.8" + } if javaVersion == "1.9" { if len(deps.bootClasspath) > 0 { var systemModules classpath