From 57a63d4c7b524da782c02dd85abf3ec314a916a1 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 11 Jun 2019 14:01:42 -0700 Subject: Fixed upb_proto_library() logic for calculating output dir. --- bazel/upb_proto_library.bzl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bazel/upb_proto_library.bzl b/bazel/upb_proto_library.bzl index 147e088..0c23f73 100644 --- a/bazel/upb_proto_library.bzl +++ b/bazel/upb_proto_library.bzl @@ -37,10 +37,8 @@ def _get_real_roots(files): return roots.keys() def _generate_output_file(ctx, src, extension): - if _is_bazel: - real_short_path = _get_real_short_path(src) - else: - real_short_path = paths.relativize(src.short_path, ctx.label.package) + real_short_path = _get_real_short_path(src) + real_short_path = paths.relativize(src.short_path, ctx.label.package) output_filename = paths.replace_extension(real_short_path, extension) ret = ctx.actions.declare_file(output_filename) return ret -- cgit v1.2.3