Skip to content

Commit 4e66d93

Browse files
Wyveraldcopybara-github
authored andcommitted
Automated rollback of commit 2a28909.
*** Reason for rollback *** We're no longer going with this approach. *** Original change description *** Add RunfilesLibraryInfo The new provider marks runfiles libraries as such and will be used by both Bazel itself and language rules to emit additional information required for executable targets to find their runfiles in the presence of repository mappings. Work towards bazelbuild#16124 Closes bazelbuild#16125. PiperOrigin-RevId: 483622668 Change-Id: I599d588cbed27c08466cc1311779925bd39a77fc
1 parent 1eff0f9 commit 4e66d93

File tree

6 files changed

+0
-148
lines changed

6 files changed

+0
-148
lines changed

src/main/java/com/google/devtools/build/lib/analysis/BUILD

-11
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ java_library(
341341
":rule_configured_object_value",
342342
":rule_definition_environment",
343343
":run_environment_info",
344-
":runfiles_library_info",
345344
":starlark/args",
346345
":starlark/bazel_build_api_globals",
347346
":starlark/function_transition_util",
@@ -1033,16 +1032,6 @@ java_library(
10331032
],
10341033
)
10351034

1036-
java_library(
1037-
name = "runfiles_library_info",
1038-
srcs = ["RunfilesLibraryInfo.java"],
1039-
deps = [
1040-
"//src/main/java/com/google/devtools/build/lib/concurrent",
1041-
"//src/main/java/com/google/devtools/build/lib/packages",
1042-
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
1043-
],
1044-
)
1045-
10461035
java_library(
10471036
name = "rule_definition_environment",
10481037
srcs = ["RuleDefinitionEnvironment.java"],

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

-56
This file was deleted.

src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkModules.java

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.google.devtools.build.lib.analysis.DefaultInfo;
2020
import com.google.devtools.build.lib.analysis.OutputGroupInfo;
2121
import com.google.devtools.build.lib.analysis.RunEnvironmentInfo;
22-
import com.google.devtools.build.lib.analysis.RunfilesLibraryInfo;
2322
import com.google.devtools.build.lib.packages.StarlarkLibrary;
2423
import com.google.devtools.build.lib.packages.StarlarkLibrary.SelectLibrary;
2524
import com.google.devtools.build.lib.packages.StructProvider;
@@ -49,6 +48,5 @@ public static void addPredeclared(ImmutableMap.Builder<String, Object> predeclar
4948
predeclared.put("Actions", ActionsProvider.INSTANCE);
5049
predeclared.put("DefaultInfo", DefaultInfo.PROVIDER);
5150
predeclared.put("RunEnvironmentInfo", RunEnvironmentInfo.PROVIDER);
52-
predeclared.put("RunfilesLibraryInfo", RunfilesLibraryInfo.PROVIDER);
5351
}
5452
}

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/RunfilesLibraryInfoApi.java

-47
This file was deleted.

src/test/java/com/google/devtools/build/lib/starlark/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ java_test(
4646
"//src/main/java/com/google/devtools/build/lib/analysis:file_provider",
4747
"//src/main/java/com/google/devtools/build/lib/analysis:resolved_toolchain_context",
4848
"//src/main/java/com/google/devtools/build/lib/analysis:run_environment_info",
49-
"//src/main/java/com/google/devtools/build/lib/analysis:runfiles_library_info",
5049
"//src/main/java/com/google/devtools/build/lib/analysis:starlark/args",
5150
"//src/main/java/com/google/devtools/build/lib/analysis:starlark/starlark_exec_group_collection",
5251
"//src/main/java/com/google/devtools/build/lib/analysis:test/analysis_test_result_info",

src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java

-31
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.google.devtools.build.lib.analysis.FilesToRunProvider;
3131
import com.google.devtools.build.lib.analysis.OutputGroupInfo;
3232
import com.google.devtools.build.lib.analysis.RunEnvironmentInfo;
33-
import com.google.devtools.build.lib.analysis.RunfilesLibraryInfo;
3433
import com.google.devtools.build.lib.analysis.RunfilesProvider;
3534
import com.google.devtools.build.lib.analysis.config.StarlarkDefinedConfigTransition;
3635
import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTarget;
@@ -3653,34 +3652,4 @@ public void nonExecutableStarlarkRuleReturningTestEnvironmentProducesAWarning()
36533652
+ " non-test target has no effect",
36543653
ImmutableSet.of(EventKind.WARNING));
36553654
}
3656-
3657-
@Test
3658-
public void runfilesLibraryInfoCanBeReturnedAndQueried() throws Exception {
3659-
scratch.file(
3660-
"examples/rules.bzl",
3661-
"def my_runfiles_library_impl(ctx):",
3662-
" return [RunfilesLibraryInfo()]",
3663-
"my_runfiles_library = rule(implementation = my_runfiles_library_impl)",
3664-
"def language_rule_impl(ctx):",
3665-
" if RunfilesLibraryInfo not in ctx.attr.dep:",
3666-
" fail('dep does not advertise RunfilesLibraryInfo')",
3667-
"language_rule = rule(",
3668-
" implementation = language_rule_impl,",
3669-
" attrs = {'dep': attr.label()},",
3670-
")");
3671-
scratch.file(
3672-
"examples/BUILD",
3673-
"load(':rules.bzl', 'language_rule', 'my_runfiles_library')",
3674-
"my_runfiles_library(name = 'runfiles_library')",
3675-
"language_rule(",
3676-
" name = 'target',",
3677-
" dep = ':runfiles_library',",
3678-
")");
3679-
3680-
ConfiguredTarget runfilesLibrary = getConfiguredTarget("//examples:runfiles_library");
3681-
assertThat(runfilesLibrary.get(RunfilesLibraryInfo.PROVIDER)).isNotNull();
3682-
3683-
// Succeeds only if targets can be queried for the presence of RunfilesLibraryInfo in Starlark.
3684-
getConfiguredTarget("//examples:target");
3685-
}
36863655
}

0 commit comments

Comments
 (0)