tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do not pass -system arg to Metalava."

Browse source 
am: c92232034e

Change-Id: I1dfbbfbf66bf051df99f07d36d62031b5227197d
This commit is contained in:
Nan Zhang 2018-06-26 15:35:19 -07:00 committed by android-build-merger
commit 81a944ddde
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
java/droiddoc.go
View file

@ -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")