From 77d0b41d2e85b4299e7cf153a0992ce4ecdb1d66 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Thu, 31 Aug 2017 16:08:39 +0100
Subject: 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
---
 java/config/config.go   | 2 ++
 java/config/makevars.go | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'java/config')

diff --git a/java/config/config.go b/java/config/config.go
index c6c8fffd..4a5a2dd0 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 29ef57d4..eda6c09f 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}")
+	}
 }
-- 
cgit v1.2.3