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/skylark/SkylarkRuleClassFunctions.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/skylark/SkylarkRuleClassFunctions.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java index 249c6b6ab2..ddc6ab5689 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java @@ -670,7 +670,11 @@ public class SkylarkRuleClassFunctions implements SkylarkRuleFunctionsApi<Artifa try { if (parentLabel != null) { LabelValidator.parseAbsoluteLabel(labelString); - labelString = parentLabel.getRelative(labelString).getUnambiguousCanonicalForm(); + // TODO(dannark): pass the environment here + labelString = + parentLabel + .getRelativeWithRemapping(labelString, ImmutableMap.of()) + .getUnambiguousCanonicalForm(); } return labelCache.get(labelString); } catch (LabelValidator.BadLabelException | LabelSyntaxException | ExecutionException e) { |