Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[6.0.0] Cherry-pick: Automated rollback of commit 2a2890913eb8f39299aa4b614ba96266ea8749f6. #16544

Merged
merged 1 commit into from
Oct 25, 2022
Merged

[6.0.0] Cherry-pick: Automated rollback of commit 2a2890913eb8f39299aa4b614ba96266ea8749f6. #16544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/main/java/com/google/devtools/build/lib/analysis/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ java_library(
":rule_configured_object_value",
":rule_definition_environment",
":run_environment_info",
":runfiles_library_info",
":starlark/args",
":starlark/bazel_build_api_globals",
":starlark/function_transition_util",
Expand Down Expand Up @@ -1033,16 +1032,6 @@ java_library(
],
)

java_library(
name = "runfiles_library_info",
srcs = ["RunfilesLibraryInfo.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/concurrent",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
],
)

java_library(
name = "rule_definition_environment",
srcs = ["RuleDefinitionEnvironment.java"],
Expand Down
56 changes: 0 additions & 56 deletions src/main/java/com/google/devtools/build/lib/analysis/RunfilesLibraryInfo.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkModules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.google.devtools.build.lib.analysis.DefaultInfo;
import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RunEnvironmentInfo;
import com.google.devtools.build.lib.analysis.RunfilesLibraryInfo;
import com.google.devtools.build.lib.packages.StarlarkLibrary;
import com.google.devtools.build.lib.packages.StarlarkLibrary.SelectLibrary;
import com.google.devtools.build.lib.packages.StructProvider;
Expand Down Expand Up @@ -49,6 +48,5 @@ public static void addPredeclared(ImmutableMap.Builder<String, Object> predeclar
predeclared.put("Actions", ActionsProvider.INSTANCE);
predeclared.put("DefaultInfo", DefaultInfo.PROVIDER);
predeclared.put("RunEnvironmentInfo", RunEnvironmentInfo.PROVIDER);
predeclared.put("RunfilesLibraryInfo", RunfilesLibraryInfo.PROVIDER);
}
}
47 changes: 0 additions & 47 deletions src/main/java/com/google/devtools/build/lib/starlarkbuildapi/RunfilesLibraryInfoApi.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/test/java/com/google/devtools/build/lib/starlark/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ java_test(
"//src/main/java/com/google/devtools/build/lib/analysis:file_provider",
"//src/main/java/com/google/devtools/build/lib/analysis:resolved_toolchain_context",
"//src/main/java/com/google/devtools/build/lib/analysis:run_environment_info",
"//src/main/java/com/google/devtools/build/lib/analysis:runfiles_library_info",
"//src/main/java/com/google/devtools/build/lib/analysis:starlark/args",
"//src/main/java/com/google/devtools/build/lib/analysis:starlark/starlark_exec_group_collection",
"//src/main/java/com/google/devtools/build/lib/analysis:test/analysis_test_result_info",
Expand Down
31 changes: 0 additions & 31 deletions src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import com.google.devtools.build.lib.analysis.FilesToRunProvider;
import com.google.devtools.build.lib.analysis.OutputGroupInfo;
import com.google.devtools.build.lib.analysis.RunEnvironmentInfo;
import com.google.devtools.build.lib.analysis.RunfilesLibraryInfo;
import com.google.devtools.build.lib.analysis.RunfilesProvider;
import com.google.devtools.build.lib.analysis.config.StarlarkDefinedConfigTransition;
import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTarget;
Expand Down Expand Up @@ -3653,34 +3652,4 @@ public void nonExecutableStarlarkRuleReturningTestEnvironmentProducesAWarning()
+ " non-test target has no effect",
ImmutableSet.of(EventKind.WARNING));
}

@Test
public void runfilesLibraryInfoCanBeReturnedAndQueried() throws Exception {
scratch.file(
"examples/rules.bzl",
"def my_runfiles_library_impl(ctx):",
" return [RunfilesLibraryInfo()]",
"my_runfiles_library = rule(implementation = my_runfiles_library_impl)",
"def language_rule_impl(ctx):",
" if RunfilesLibraryInfo not in ctx.attr.dep:",
" fail('dep does not advertise RunfilesLibraryInfo')",
"language_rule = rule(",
" implementation = language_rule_impl,",
" attrs = {'dep': attr.label()},",
")");
scratch.file(
"examples/BUILD",
"load(':rules.bzl', 'language_rule', 'my_runfiles_library')",
"my_runfiles_library(name = 'runfiles_library')",
"language_rule(",
" name = 'target',",
" dep = ':runfiles_library',",
")");

ConfiguredTarget runfilesLibrary = getConfiguredTarget("//examples:runfiles_library");
assertThat(runfilesLibrary.get(RunfilesLibraryInfo.PROVIDER)).isNotNull();

// Succeeds only if targets can be queried for the presence of RunfilesLibraryInfo in Starlark.
getConfiguredTarget("//examples:target");
}
}