From a8d7357b7dc66e0531c298e4d369e6342fcf94b7 Mon Sep 17 00:00:00 2001 From: dannark Date: Thu, 21 Jun 2018 17:46:06 -0700 Subject: Audit usages of Label.getRelative and update to Label.getRelativeWithRemapping RELNOTES: None PiperOrigin-RevId: 201617188 --- src/main/java/com/google/devtools/build/lib/packages/BuildType.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/packages/BuildType.java') diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java index d7811acc32..ecc397bd98 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java @@ -268,9 +268,10 @@ public final class BuildType { // TODO(b/110101445): check if context is ever actually null if (context == null) { return Label.parseAbsolute((String) x, false); - // TODO(b/110308446): remove instances of context being a Label + // TODO(b/110308446): remove instances of context being a Label } else if (context instanceof Label) { - return ((Label) context).getRelative(STRING.convert(x, what, context)); + return ((Label) context) + .getRelativeWithRemapping(STRING.convert(x, what, context), ImmutableMap.of()); } else if (context instanceof LabelConversionContext) { LabelConversionContext labelConversionContext = (LabelConversionContext) context; return labelConversionContext -- cgit v1.2.3