diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-06-11 14:01:42 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2019-06-11 14:01:42 -0700 |
| commit | 57a63d4c7b524da782c02dd85abf3ec314a916a1 (patch) | |
| tree | 09a97d677363b34c9c866f14fbcebd1ab052d0a4 /bazel | |
| parent | 7cd1b9362ba60e08ca62b58efcd4acde240f5fdd (diff) | |
Fixed upb_proto_library() logic for calculating output dir.
Diffstat (limited to 'bazel')
| -rw-r--r-- | bazel/upb_proto_library.bzl | 6 |
1 files 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 |