diff --git a/java/config/config.go b/java/config/config.go
index c6c8fffd0..4a5a2dd07 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -55,6 +55,8 @@ func init() {
 	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 29ef57d44..eda6c09fc 100644
--- a/java/config/makevars.go
+++ b/java/config/makevars.go
@@ -45,4 +45,9 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
 		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}")
+	}
 }