Merge pull request #182 from haberman/bazelfix

Fixed upb_proto_library() logic for calculating output dir.
6 years ago · ef6ce94bfe
parent 7cd1b9362b 57a63d4c7b
commit ef6ce94bfe
1 changed files with 2 additions and 4 deletions
--- 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