diff options
| author |  Benjamin Peterson <bp@benjamin.pe> | 2018-07-04 07:40:46 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-04 07:42:14 -0700 |
| commit | 9b6208c6d74a5d485bed43f4a214f331e32d8ef6 (patch) | |
| tree | 317a2338902fa5f7b5671bde98a3d5683413b465 /tools | |
| parent | df42789d3e71a97a6ad0fbccb4ea9db4f05e2c7c (diff) | |
Remove the java_host_runtime_alias polyfill.
Closes #5424.
Change-Id: I16bb70ffec9d541c56ed0579ae616407073d46f2
PiperOrigin-RevId: 203279412
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/jdk/BUILD | 4 | ||||
| -rw-r--r-- | tools/jdk/alias_rules.bzl | 29 |
2 files changed, 0 insertions, 33 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index b364df660a..14699e14d0 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -1,8 +1,5 @@ package(default_visibility = ["//visibility:public"]) -# TODO(lberki): Remove this once java_toolchain_alias and java_runtime_alias are -# in a Bazel release -load("//tools/jdk:alias_rules.bzl", "java_host_runtime_alias") load( "//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain", @@ -249,7 +246,6 @@ filegroup( srcs = [ "BUILD-jdk", # Tools are build from the workspace for tests. "DumpPlatformClassPath.java", - "alias_rules.bzl", "default_java_toolchain.bzl", "proguard_whitelister.py", "proguard_whitelister_test.py", diff --git a/tools/jdk/alias_rules.bzl b/tools/jdk/alias_rules.bzl deleted file mode 100644 index 134c1e898f..0000000000 --- a/tools/jdk/alias_rules.bzl +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2017 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -def _java_host_runtime_alias_impl(ctx): - vars = ctx.attr._host_java_runtime[platform_common.TemplateVariableInfo] - runtime_info = ctx.attr._host_java_runtime[java_common.JavaRuntimeInfo] - runtime_toolchain = ctx.attr._host_java_runtime[platform_common.ToolchainInfo] - return struct(providers = [vars, runtime_info, runtime_toolchain]) - -java_host_runtime_alias = rule( - attrs = { - "_host_java_runtime": attr.label( - default = Label("//tools/jdk:java_runtime_alias"), - cfg = "host", - ), - }, - implementation = _java_host_runtime_alias_impl, -) |