From 301b6e2d7839b7f835d410a59f76c7fcf3e692f2 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 14 May 2019 10:15:32 -0700 Subject: Removed map_dep() in favor of rewrites. --- build_defs.bzl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'build_defs.bzl') diff --git a/build_defs.bzl b/build_defs.bzl index 70854d9..5517933 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -239,12 +239,6 @@ google3_dep_map = { "@com_google_protobuf//:protoc_lib": "//third_party/protobuf:libprotoc", } -def map_dep(dep): - if is_bazel: - return dep - else: - return google3_dep_map[dep] - def _get_real_short_path(file): # For some reason, files from other archives have short paths that look like: # ../com_google_protobuf/google/protobuf/descriptor.proto @@ -430,10 +424,10 @@ _upb_proto_library_aspect = aspect( "_protoc": attr.label( executable = True, cfg = "host", - default = map_dep("@com_google_protobuf//:protoc"), + default = "@com_google_protobuf//:protoc", ), "_cc_toolchain": attr.label( - default = map_dep("@bazel_tools//tools/cpp:current_cc_toolchain"), + default = "@bazel_tools//tools/cpp:current_cc_toolchain", ), "_upb": attr.label(default = ":upb"), "_ext": attr.string(default = ".upb"), @@ -481,7 +475,7 @@ upb_proto_srcs = rule( "_protoc": attr.label( executable = True, cfg = "host", - default = map_dep("@com_google_protobuf//:protoc"), + default = "@com_google_protobuf//:protoc", ), "deps": attr.label_list(), "ext": attr.string(default = ".upb") -- cgit v1.2.3