diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-26 22:20:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-26 22:20:35 +0000 |
| commit | c92232034e3cdfee48451402f45d20f097ca16a4 (patch) | |
| tree | 70812d421becbb6e7e3c0ac1d967e7e40f61a58d | |
| parent | 9d951a10f39b4d322e829f4d5786b9e0fbb685b8 (diff) | |
| parent | c94f9d886c0c4fd0fe4d6cb17acdd3469fd555e4 (diff) | |
| download | build_soong-c92232034e3cdfee48451402f45d20f097ca16a4.tar.gz build_soong-c92232034e3cdfee48451402f45d20f097ca16a4.tar.bz2 build_soong-c92232034e3cdfee48451402f45d20f097ca16a4.zip | |
Merge "Do not pass -system arg to Metalava."
| -rw-r--r-- | java/droiddoc.go | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index e0e8612f..1eb935f1 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -646,20 +646,11 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { if !Bool(d.properties.Metalava_enabled) { javaVersion = "1.8" } - if javaVersion == "1.9" { - if len(deps.bootClasspath) > 0 { - var systemModules classpath - if deps.systemModules != nil { - systemModules = append(systemModules, deps.systemModules) - } - bootClasspathArgs = systemModules.FormJavaSystemModulesPath("--system ", ctx.Device()) - bootClasspathArgs = bootClasspathArgs + " --patch-module java.base=." - } - } else { - if len(deps.bootClasspath.Strings()) > 0 { - // For OpenJDK 8 we can use -bootclasspath to define the core libraries code. - bootClasspathArgs = deps.bootClasspath.FormJavaClassPath("-bootclasspath") - } + // continue to use -bootclasspath even if Metalava under -source 1.9 is enabled + // since it doesn't support system modules yet. + if len(deps.bootClasspath.Strings()) > 0 { + // For OpenJDK 8 we can use -bootclasspath to define the core libraries code. + bootClasspathArgs = deps.bootClasspath.FormJavaClassPath("-bootclasspath") } classpathArgs := deps.classpath.FormJavaClassPath("-classpath") |