commit 0bf1f85c489d3b649c3f5fd9d064586ed3376a36
author Tobias Thierer <tobiast@google.com> Fri Sep 01 08:37:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 01 08:37:58 2017 +0000
tree e6e7d8ecc9f9ad01431278c07f9b0b49dd73964d
parent 40962998a21708a4a06c8fd9b2254b6db7796f64
parent 77d0b41d2e85b4299e7cf153a0992ce4ecdb1d66

Merge "Export JLINK and JMOD commands from soong."

java/config/config.go

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")

java/config/makevars.go

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}")
+	}
 }