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

Merge "Disable the system-modules plugin for jlink invocations."

Browse Source
This commit is contained in:
Pete Gillin
2019-06-07 10:35:56 +00:00
committed by Gerrit Code Review
parent 42729b481a 4eb6be32f6
commit 14bb14e0c3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/system_modules.go
View File

@@ -42,7 +42,11 @@ var (
`${config.MergeZipsCmd} -j ${workDir}/module.jar ${workDir}/classes.jar $in && ` + `${config.MergeZipsCmd} -j ${workDir}/module.jar ${workDir}/classes.jar $in && ` +
`${config.JmodCmd} create --module-version 9 --target-platform android ` + `${config.JmodCmd} create --module-version 9 --target-platform android ` +
` --class-path ${workDir}/module.jar ${workDir}/jmod/${moduleName}.jmod && ` + ` --class-path ${workDir}/module.jar ${workDir}/jmod/${moduleName}.jmod && ` +
`${config.JlinkCmd} --module-path ${workDir}/jmod --add-modules ${moduleName} --output ${outDir} && ` + `${config.JlinkCmd} --module-path ${workDir}/jmod --add-modules ${moduleName} --output ${outDir} ` +
// Note: The system-modules jlink plugin is disabled because (a) it is not
// useful on Android, and (b) it causes errors with later versions of jlink
// when the jdk.internal.module is absent from java.base (as it is here).
` --disable-plugin system-modules && ` +
`cp ${config.JrtFsJar} ${outDir}/lib/`, `cp ${config.JrtFsJar} ${outDir}/lib/`,
CommandDeps: []string{ CommandDeps: []string{
"${moduleInfoJavaPath}", "${moduleInfoJavaPath}",