From c6bdd390b7ab7cac7014744f3ded3fe9e10f6deb Mon Sep 17 00:00:00 2001 From: Zhexuan Yang Date: Mon, 8 Aug 2016 11:03:49 +0000 Subject: fixed strip_prefix related with issue#1604 -- Change-Id: I49d4bcdb60052a5cf94049f962732ee2167828f1 Reviewed-on: https://bazel-review.googlesource.com/#/c/4300 MOS_MIGRATED_REVID=129615052 --- tools/build_defs/pkg/path.bzl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/build_defs/pkg/path.bzl b/tools/build_defs/pkg/path.bzl index 135e2199b0..0b544299ee 100644 --- a/tools/build_defs/pkg/path.bzl +++ b/tools/build_defs/pkg/path.bzl @@ -48,6 +48,9 @@ def compute_data_path(out, data_path): elif data_path[0] == "/": # Absolute path return data_path[1:] else: # Relative to a sub-directory - return _short_path_dirname(out) + "/" + data_path + tmp_short_path_dirname = _short_path_dirname(out) + if tmp_short_path_dirname: + return tmp_short_path_dirname + "/" + data_path + return data_path else: return None -- cgit v1.2.3