Export JLINK and JMOD commands from soong.
jlink and jmod are new commands added in OpenJDK 9.
The new commands are exported only when the environment
variable EXPERIMENTAL_USE_OPENJDK9 is set to true.
Control of toolchain commands moved to soong in commit
2aad9c2882a1e2902597c66ac7ad29918b8ad0eb
Bug: 38177569
Test: Treehugger
Change-Id: I52d81b95357162e31a2017080b27ef076a470b14
diff --git a/java/config/config.go b/java/config/config.go
index c6c8fff..4a5a2dd 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -55,6 +55,8 @@
pctx.SourcePathVariable("JavaCmd", "${JavaToolchain}/java")
pctx.SourcePathVariable("JarCmd", "${JavaToolchain}/jar")
pctx.SourcePathVariable("JavadocCmd", "${JavaToolchain}/javadoc")
+ pctx.SourcePathVariable("JlinkCmd", "${JavaToolchain}/jlink")
+ pctx.SourcePathVariable("JmodCmd", "${JavaToolchain}/jmod")
pctx.StaticVariable("Zip2ZipCmd", filepath.Join("${bootstrap.ToolDir}", "zip2zip"))
pctx.SourcePathVariable("JarArgsCmd", "build/soong/scripts/jar-args.sh")
diff --git a/java/config/makevars.go b/java/config/makevars.go
index 29ef57d..eda6c09 100644
--- a/java/config/makevars.go
+++ b/java/config/makevars.go
@@ -45,4 +45,9 @@
ctx.Strict("TARGET_JAVAC", "${JavacCmd} ${CommonJdkFlags}")
ctx.Strict("HOST_JAVAC", "${JavacCmd} ${CommonJdkFlags}")
}
+
+ if ctx.Config().IsEnvTrue("EXPERIMENTAL_USE_OPENJDK9") {
+ ctx.Strict("JLINK", "${JlinkCmd}")
+ ctx.Strict("JMOD", "${JmodCmd}")
+ }
}