StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use OpenJDK9 for building

Browse Source 
Remove support for compiling with javac from OpenJDK8.
We still target 1.8 by default, and OpenJDK8 prebuilts are still
required for the bootclasspath and running robolectric.

Bug: 38418220
Test: m java
Change-Id: I5686deb0ae4f9927192a039d08adc0117b2605dd
This commit is contained in:
Colin Cross
2018-06-19 22:49:39 -07:00
parent 6654810f37
commit 997262f506
4 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/droiddoc.go
View File

@@ -540,20 +540,13 @@ func (j *Javadoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
var bootClasspathArgs, classpathArgs string
javaVersion := getJavaVersion(ctx, String(j.properties.Java_version), String(j.properties.Sdk_version))
if javaVersion == "1.9" || ctx.Config().UseOpenJDK9() {
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")
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=."
}
if len(deps.classpath.Strings()) > 0 {
classpathArgs = "-classpath " + strings.Join(deps.classpath.Strings(), ":")