summaryrefslogtreecommitdiff
path: root/java/system_modules.go
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-12-21 17:30:08 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-21 17:30:08 +0000
commitbdfb169e90f4bb687cfa7345a4bf1458ae9709c8 (patch)
tree28c7b657cf3af744e5f57388b3d9b0d6b425126b /java/system_modules.go
parentc97dfe42b9307deded482067f45da0f6cc1b81c6 (diff)
parent088e079803239036a079b28d8670d97b90bd1bcc (diff)
Merge "Change target platform to LINUX-OTHER" into main
Diffstat (limited to 'java/system_modules.go')
-rw-r--r--java/system_modules.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/system_modules.go b/java/system_modules.go
index 1c7917109..f3446483b 100644
--- a/java/system_modules.go
+++ b/java/system_modules.go
@@ -55,7 +55,8 @@ var (
`${config.MergeZipsCmd} -j ${workDir}/module.jar ${workDir}/classes.jar $in && ` +
// Note: The version of the java.base module created must match the version
// of the jlink tool which consumes it.
- `${config.JmodCmd} create --module-version ${config.JlinkVersion} --target-platform android ` +
+ // Use LINUX-OTHER to be compatible with JDK 21+ (b/294137077)
+ `${config.JmodCmd} create --module-version ${config.JlinkVersion} --target-platform LINUX-OTHER ` +
` --class-path ${workDir}/module.jar ${workDir}/jmod/java.base.jmod && ` +
`${config.JlinkCmd} --module-path ${workDir}/jmod --add-modules java.base --output ${outDir} ` +
// Note: The system-modules jlink plugin is disabled because (a) it is not