diff options
| author |  Stephen Twigg <twigg@google.com> | 2017-04-05 19:32:44 +0000 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-04-06 11:00:19 +0200 |
| commit | d119f969a30945a1fc29a24a293f6873ff73960d (patch) | |
| tree | 1b87c52cbbec1190ffee8ee92da0a01fb63c92a7 /src/main/tools | |
| parent | fdf0646ba748f1a26094bfb06ef8bf2da65a7fb9 (diff) | |
Add runfiles in jdk.BUILD
Add jdk as runfiles for java, jar, and javac in jdk.BUILD. Done via data
attribute of filegroup.
This should 'mostly' work if you handwave around the differences between
default_runfiles and data_runfiles. The jdk runfiles will always be
accessed via data_runfiles, and thus not platform-targeted. Therefore, my
expectation is the target machine will be sent the host JDK.
However, since the jdk is itself composed of binary imports anyway, it
seems like the JDK already has issues being platform-targeted.
To reviewers:
I didn't do a thorough audit of the jdk.BUILD file. More specifically,
unsure if xjc or wsimport need a jdk as well.
Still investigating a good testing strategy.
Change-Id: I138b95b8cee2808c89e4202b822ada6a6577acce
PiperOrigin-RevId: 152290935
Diffstat (limited to 'src/main/tools')
| -rw-r--r-- | src/main/tools/jdk.BUILD | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD index 3e273442a1..ac7a6bbf29 100644 --- a/src/main/tools/jdk.BUILD +++ b/src/main/tools/jdk.BUILD @@ -33,6 +33,7 @@ filegroup( ":windows_msvc" : ["bin/java.exe"], "//conditions:default" : ["bin/java"], }), + data = [":jdk"], ) filegroup( @@ -43,6 +44,7 @@ filegroup( ":windows_msvc" : ["bin/jar.exe"], "//conditions:default" : ["bin/jar"], }), + data = [":jdk"], ) filegroup( @@ -53,6 +55,7 @@ filegroup( ":windows_msvc" : ["bin/javac.exe"], "//conditions:default" : ["bin/javac"], }), + data = [":jdk"], ) |