aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/protobuf
diff options
context:
space:
mode:
authorGravatar Carmi Grushko <carmi@google.com>2016-12-07 18:08:11 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-12-07 22:20:22 +0000
commitb85ba50001dd1972065978157dc704e926fd0a60 (patch)
tree84b673f5204f5c009a742576b9ad9dbc371111d7 /third_party/protobuf
parent2c2d19007818204e552f47ffe8721322a7ff8558 (diff)
Use proto_lang_toolchain() directly, now that it is released in Bazel 0.4.1.
-- PiperOrigin-RevId: 141322619 MOS_MIGRATED_REVID=141322619
Diffstat (limited to 'third_party/protobuf')
-rw-r--r--third_party/protobuf/3.0.0/BUILD1
-rw-r--r--third_party/protobuf/3.0.0/com_google_protobuf_java.BUILD2
-rw-r--r--third_party/protobuf/3.0.0/proto_lang_toolchain_if_exists.bzl24
3 files changed, 0 insertions, 27 deletions
diff --git a/third_party/protobuf/3.0.0/BUILD b/third_party/protobuf/3.0.0/BUILD
index be7694feaf..5260df61c3 100644
--- a/third_party/protobuf/3.0.0/BUILD
+++ b/third_party/protobuf/3.0.0/BUILD
@@ -3,7 +3,6 @@ package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load("//third_party/protobuf/3.0.0:protobuf.bzl", "py_proto_library")
-load(":proto_lang_toolchain_if_exists.bzl", "proto_lang_toolchain")
filegroup(
name = "srcs",
diff --git a/third_party/protobuf/3.0.0/com_google_protobuf_java.BUILD b/third_party/protobuf/3.0.0/com_google_protobuf_java.BUILD
index ce43ac82d4..fe8e3f0fcb 100644
--- a/third_party/protobuf/3.0.0/com_google_protobuf_java.BUILD
+++ b/third_party/protobuf/3.0.0/com_google_protobuf_java.BUILD
@@ -1,5 +1,3 @@
-load(":proto_lang_toolchain_if_exists.bzl", "proto_lang_toolchain")
-
java_import(
name = "protobuf",
jars = ["protobuf-java-3.0.0.jar"],
diff --git a/third_party/protobuf/3.0.0/proto_lang_toolchain_if_exists.bzl b/third_party/protobuf/3.0.0/proto_lang_toolchain_if_exists.bzl
deleted file mode 100644
index d0416f600d..0000000000
--- a/third_party/protobuf/3.0.0/proto_lang_toolchain_if_exists.bzl
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2016 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.
-
-"""Calls proto_lang_toolchain(), but only if it's already been released."""
-
-# TODO(carmi): Delete this after proto_lang_toolchain() is released in Bazel.
-def proto_lang_toolchain(**kwargs):
- """Calls proto_lang_toolchain(), but only if it's already been released."""
- if hasattr(native, 'proto_lang_toolchain'):
- native.proto_lang_toolchain(**kwargs)
- else:
- native.filegroup(name = kwargs['name'])
-