From 6f15335deac0c04cfae11623efbe745f11e177ff Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Mon, 21 Mar 2016 16:20:06 +0000 Subject: Make labels in .bzl files in remote repos resolve relative to their repo For example, if you have a BUILD file that does: load('@foo//bar:baz.bzl', 'my_rule') my_rule(...) If baz.bzl uses Label('//whatever'), this change makes //whatever resolve to @foo//whatever. Previous to this change, it would be resolved to the repository the BUILD file using my_rule was in. RELNOTES[INC]: Labels in .bzl files in remote repositories will be resolved relative to their repository (instead of the repository the Skylark rule is used in). -- MOS_MIGRATED_REVID=117720181 --- .../google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java index 47ee3efcac..c4889fa7d8 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java @@ -360,7 +360,7 @@ public class SkylarkImportLookupFunction implements SkyFunction { com.google.devtools.build.lib.syntax.Environment extensionEnv = ruleClassProvider .createSkylarkRuleClassEnvironment( - mutability, eventHandler, ast.getContentHashCode(), importMap) + extensionLabel, mutability, eventHandler, ast.getContentHashCode(), importMap) .setupOverride("native", packageFactory.getNativeModule(inWorkspace)); ast.exec(extensionEnv, eventHandler); try { -- cgit v1.2.3