diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-06-25 13:00:25 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-06-25 13:00:25 -0700 |
| commit | 7ca467854e5f7dea47f6376086b97ab2f994e438 (patch) | |
| tree | 59b824ae6793133f43e41d66089604bb0c28cedb /java | |
| parent | 297d9bcedaa14670a84c3dc4d4bf90b9ea033bea (diff) | |
| download | build_soong-7ca467854e5f7dea47f6376086b97ab2f994e438.tar.gz build_soong-7ca467854e5f7dea47f6376086b97ab2f994e438.tar.bz2 build_soong-7ca467854e5f7dea47f6376086b97ab2f994e438.zip | |
Override javaVersion for Doclava when EXPERIMENTAL_USE_OPENJDK9=trueandroid-p-preview-4
Test: N/A
Bug: 110786923
Change-Id: I6d1f808e97aad2fe3206f52c8fc93c87b61fdb64
Diffstat (limited to 'java')
| -rw-r--r-- | java/droiddoc.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 9821bcf2..e0e8612f 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 |