diff options
author | 2017-02-16 17:06:18 +0000 | |
---|---|---|
committer | 2017-02-17 14:51:20 +0000 | |
commit | 00502a71b621f9ada11040c9c2cca259bdbfc7a5 (patch) | |
tree | f31dde6ca0b1edfe934fdc3228c93ad8e0b13509 /src | |
parent | bef19d10b1262e610569b4f604635eb0bea07e01 (diff) |
Migrate to java_runtime{,_suite}
--
PiperOrigin-RevId: 147727032
MOS_MIGRATED_REVID=147727032
Diffstat (limited to 'src')
-rw-r--r-- | src/main/tools/jdk.BUILD | 10 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD index 6fcbcab94d..07710d65b6 100644 --- a/src/main/tools/jdk.BUILD +++ b/src/main/tools/jdk.BUILD @@ -126,15 +126,13 @@ filegroup( ]), ) -# Bazel looks for a label ending in -<cpu>, or -default if it can't find one. -filegroup( +java_runtime_suite( name = "jdk", - srcs = [ - ":jdk-default", - ], + runtimes = {}, + default = ":jdk-default", ) -filegroup( +java_runtime( name = "jdk-default", srcs = [ ":jdk-bin", diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 9ca17e7cb2..0ac2fa5cc5 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -100,9 +100,8 @@ public final class BazelAnalysisMock extends AnalysisMock { " genclass = ['GenClass_deploy.jar'],", " ijar = ['ijar'],", ")", - "filegroup(name = 'jdk-null')", - "filegroup(name = 'jdk-default', srcs = [':java'], path = 'jdk/jre')", - "filegroup(name = 'jdk', srcs = [':jdk-default', ':jdk-null'])", + "java_runtime(name = 'jdk-default', srcs = [])", + "java_runtime_suite(name = 'jdk', runtimes = {}, default = ':jdk-default')", "filegroup(name='langtools', srcs=['jdk/lib/tools.jar'])", "filegroup(name='bootclasspath', srcs=['jdk/jre/lib/rt.jar'])", "filegroup(name='extdir', srcs=glob(['jdk/jre/lib/ext/*']))", |