diff options
| author |  cushon <cushon@google.com> | 2018-07-05 11:54:59 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-05 11:56:37 -0700 |
| commit | 6e0466f2c9d76d1ad9c1ee8ef7b3013e002765f1 (patch) | |
| tree | deb76183d2d00f137f341b57e69f5ca199ac1e17 /src/test/java/com/google/devtools/build/lib/analysis | |
| parent | 55d0c1c649d3117f59e3d5d7b79de12d6b090381 (diff) | |
Remove support for java_runtime_suite
RELNOTES: Remove support for java_runtime_suite; use alias() together with select() instead.
PiperOrigin-RevId: 203393253
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 a176758fe2..298bfc0c2d 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 @@ -92,13 +92,12 @@ public final class BazelAnalysisMock extends AnalysisMock { " genclass = ['GenClass_deploy.jar'],", " ijar = ['ijar'],", ")", - "java_runtime(name = 'jdk-default', srcs = [])", + "java_runtime(name = 'jdk', srcs = [])", + "java_runtime(name = 'host_jdk', srcs = [])", "java_runtime_alias(name = 'current_java_runtime')", // This isn't actually the host runtime, but will do. This way, we don't need to pull in the // Skylark implementation of the java_host_runtime_alias rule. "java_runtime_alias(name = 'current_host_java_runtime')", - "java_runtime_suite(name = 'jdk', runtimes = {}, default = ':jdk-default')", - "java_runtime_suite(name = 'host_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/*']))", @@ -111,7 +110,6 @@ public final class BazelAnalysisMock extends AnalysisMock { " 'turbine_deploy.jar','ExperimentalTestRunner_deploy.jar'])", "sh_binary(name = 'proguard_whitelister', srcs = ['empty.sh'])"); - ImmutableList<String> androidBuildContents = createAndroidBuildContents(); config.create( "/bazel_tools_workspace/tools/android/BUILD", |