diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java index ee5a12ae32a568..f07c201aede21a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java @@ -95,6 +95,13 @@ public final Artifact getRunfilesManifest() { return runfilesSupport != null ? runfilesSupport.getRunfilesManifest() : null; } + @Nullable + @Override + public Artifact getRepoMappingManifest() { + var runfilesSupport = getRunfilesSupport(); + return runfilesSupport != null ? runfilesSupport.getRepoMappingManifest() : null; + } + /** Returns a {@link RunfilesSupplier} encapsulating runfiles for this tool. */ public final RunfilesSupplier getRunfilesSupplier() { return firstNonNull(getRunfilesSupport(), EmptyRunfilesSupplier.INSTANCE); diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/FilesToRunProviderApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/FilesToRunProviderApi.java index 7dab417d98e9e4..5c0006bf053905 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/FilesToRunProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/FilesToRunProviderApi.java @@ -39,4 +39,12 @@ public interface FilesToRunProviderApi extends StarlarkVa allowReturnNones = true) @Nullable FileT getRunfilesManifest(); + + @StarlarkMethod( + name = "repo_mapping_manifest", + doc = "The repo mapping manifest or None if it does not exist.", + structField = true, + allowReturnNones = true) + @Nullable + FileT getRepoMappingManifest(); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/RunfilesRepoMappingManifestTest.java b/src/test/java/com/google/devtools/build/lib/analysis/RunfilesRepoMappingManifestTest.java index e7949ebee49215..21cd1832c3ba50 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/RunfilesRepoMappingManifestTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/RunfilesRepoMappingManifestTest.java @@ -391,6 +391,32 @@ public void hasMappingForSymlinks() throws Exception { .inOrder(); } + @Test + public void repoMappingOnFilesToRunProvider() throws Exception { + scratch.overwriteFile("MODULE.bazel", "bazel_dep(name='bare_rule',version='1.0')"); + scratch.overwriteFile( + "defs.bzl", + "def _get_repo_mapping_impl(ctx):", + " files_to_run = ctx.attr.bin[DefaultInfo].files_to_run", + " return [", + " DefaultInfo(files = depset([files_to_run.repo_mapping_manifest])),", + " ]", + "get_repo_mapping = rule(", + " implementation = _get_repo_mapping_impl,", + " attrs = {'bin':attr.label(cfg='target',executable=True)}", + ")"); + scratch.overwriteFile( + "BUILD", + "load('@bare_rule//:defs.bzl', 'bare_binary')", + "load('//:defs.bzl', 'get_repo_mapping')", + "bare_binary(name='aaa')", + "get_repo_mapping(name='get_repo_mapping', bin=':aaa')"); + invalidatePackages(); + + assertThat(getFilesToBuild(getConfiguredTarget("//:get_repo_mapping")).toList()) + .containsExactly(getRunfilesSupport("//:aaa").getRepoMappingManifest()); + } + /** * Similar to {@link BuildViewTestCase#rewriteWorkspace(String...)}, but does not call {@link * BuildViewTestCase#invalidatePackages()}.