diff options
author | dannark <dannark@google.com> | 2018-06-21 17:46:06 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-21 17:48:01 -0700 |
commit | a8d7357b7dc66e0531c298e4d369e6342fcf94b7 (patch) | |
tree | a2ed8c5ee313d2113ac562a1ed57b5580683b108 /src/main/java/com/google/devtools/build/lib/analysis/LabelExpander.java | |
parent | db461d0e8a15aff0c4af219fd4a7a5b668ab1289 (diff) |
Audit usages of Label.getRelative and update to Label.getRelativeWithRemapping
RELNOTES: None
PiperOrigin-RevId: 201617188
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/LabelExpander.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/LabelExpander.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LabelExpander.java b/src/main/java/com/google/devtools/build/lib/analysis/LabelExpander.java index bac4c0a52b..c741275dc3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/LabelExpander.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/LabelExpander.java @@ -17,6 +17,7 @@ package com.google.devtools.build.lib.analysis; import com.google.common.base.CharMatcher; import com.google.common.base.Preconditions; import com.google.common.base.Strings; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.cmdline.Label; @@ -153,7 +154,7 @@ public final class LabelExpander { */ private static Label resolveLabelText(String labelText, Label labelResolver) { try { - return labelResolver.getRelative(labelText); + return labelResolver.getRelativeWithRemapping(labelText, ImmutableMap.of()); } catch (LabelSyntaxException e) { // It's a heuristic, so quietly ignore "errors". Because Label.getRelative never // returns null, we can use null to indicate an error. |