commit f4b9ff40b8f1612571cc711560177af240d034d0
author dannark <dannark@google.com> Tue Jun 12 09:28:45 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Jun 12 09:30:48 2018 -0700
tree 2b2bf5415d7b4a0ab5db78d916cebfec0775f810
parent 1b94e64ee8a1d385e92a8d9f4c9a06e2d99c82bf

Remap repository names inside load statements in BUILD files if the repository name is remapped.

For example if main/WORKSPACE contains:
local_repository(
    name = "a",
    path = "../a",
    repo_mapping = {"@x" : "@y"},
)

a/BUILD
load("@x//:sample.bzl", "sample")

Then the load in a/BUILD will be resolved as "@y//:sample.bzl"

RELNOTES: None
PiperOrigin-RevId: 200227431

src/main/java/com/google/devtools/build/lib/analysis/BuildView.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 2651e65..4e1d59e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -539,7 +539,9 @@
         }
         SkylarkImport skylarkImport;
         try {
-          skylarkImport = SkylarkImports.create(bzlFileLoadLikeString);
+          skylarkImport =
+              SkylarkImports.create(
+                  bzlFileLoadLikeString, /* repositoryMapping= */ ImmutableMap.of());
         } catch (SkylarkImportSyntaxException e) {
           throw new ViewCreationFailedException(
               String.format("Invalid aspect '%s': %s", aspect, e.getMessage()), e);