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

Merge "Change target platform to LINUX-OTHER" into main am: bdfb169e90

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2887966

Change-Id: I019f20e8720e54858abcea1090cc03e4edb3e17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-12-21 18:03:09 +00:00
committed by Automerger Merge Worker
parent fa139b17f9 bdfb169e90
commit 8d1a67806a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/system_modules.go
View File

@@ -55,7 +55,8 @@ var (
`${config.MergeZipsCmd} -j ${workDir}/module.jar ${workDir}/classes.jar $in && ` + `${config.MergeZipsCmd} -j ${workDir}/module.jar ${workDir}/classes.jar $in && ` +
// Note: The version of the java.base module created must match the version // Note: The version of the java.base module created must match the version
// of the jlink tool which consumes it. // 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 && ` + ` --class-path ${workDir}/module.jar ${workDir}/jmod/java.base.jmod && ` +
`${config.JlinkCmd} --module-path ${workDir}/jmod --add-modules java.base --output ${outDir} ` + `${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 // Note: The system-modules jlink plugin is disabled because (a) it is not