diff options
| author | 2019-06-07 10:35:56 +0000 | |
|---|---|---|
| committer | 2019-06-07 10:35:56 +0000 | |
| commit | 14bb14e0c32e1ba656069f8af5819b5f41d1ea03 (patch) | |
| tree | b2637fb22814c5e1e981048c09f1bc1312f47a1d /java/system_modules.go | |
| parent | 42729b481a9ce4aa74b122cb1f518a235742cf82 (diff) | |
| parent | 4eb6be32f6c9ba167cfed57a6221cc9d0d2cba15 (diff) | |
Merge "Disable the system-modules plugin for jlink invocations."
Diffstat (limited to 'java/system_modules.go')
| -rw-r--r-- | java/system_modules.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/system_modules.go b/java/system_modules.go index 8005360a2..2ec3dfbd5 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -42,7 +42,11 @@ var ( `${config.MergeZipsCmd} -j ${workDir}/module.jar ${workDir}/classes.jar $in && ` + `${config.JmodCmd} create --module-version 9 --target-platform android ` + ` --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/`, CommandDeps: []string{ "${moduleInfoJavaPath}", |