File tree 3 files changed +0
-23
lines changed
src/main/java/com/google/devtools/build/lib/bazel 3 files changed +0
-23
lines changed Original file line number Diff line number Diff line change @@ -40,20 +40,10 @@ public static class Options extends FragmentOptions {
40
40
help = "If enabled, visibility checking also applies to toolchain implementations." )
41
41
public boolean checkVisibilityForToolchains ;
42
42
43
- @ Option (
44
- name = "incompatible_remove_exec_tools" ,
45
- defaultValue = "false" ,
46
- documentationCategory = OptionDocumentationCategory .UNCATEGORIZED ,
47
- effectTags = {OptionEffectTag .BUILD_FILE_SEMANTICS },
48
- metadataTags = {OptionMetadataTag .INCOMPATIBLE_CHANGE },
49
- help = "If enabled, use of genrule's exec_tools attribute will cause an error.." )
50
- public boolean removeExecTools ;
51
-
52
43
@ Override
53
44
public FragmentOptions getExec () {
54
45
Options exec = (Options ) getDefault ();
55
46
exec .checkVisibilityForToolchains = checkVisibilityForToolchains ;
56
- exec .removeExecTools = removeExecTools ;
57
47
58
48
return exec ;
59
49
}
Original file line number Diff line number Diff line change @@ -18,7 +18,6 @@ java_library(
18
18
"//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster" ,
19
19
"//src/main/java/com/google/devtools/build/lib/analysis:config/execution_transition_factory" ,
20
20
"//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment" ,
21
- "//src/main/java/com/google/devtools/build/lib/bazel:bazel_configuration" ,
22
21
"//src/main/java/com/google/devtools/build/lib/packages" ,
23
22
"//src/main/java/com/google/devtools/build/lib/rules/genrule" ,
24
23
"//src/main/java/com/google/devtools/build/lib/util:filetype" ,
Original file line number Diff line number Diff line change 16
16
17
17
import com .google .devtools .build .lib .analysis .CommandHelper ;
18
18
import com .google .devtools .build .lib .analysis .RuleContext ;
19
- import com .google .devtools .build .lib .bazel .BazelConfiguration ;
20
- import com .google .devtools .build .lib .packages .BuildType ;
21
19
import com .google .devtools .build .lib .packages .Type ;
22
20
import com .google .devtools .build .lib .rules .genrule .GenRuleBase ;
23
21
@@ -38,16 +36,6 @@ protected boolean isStampingEnabled(RuleContext ruleContext) {
38
36
// projects are migrated.
39
37
@ Override
40
38
protected CommandHelper .Builder commandHelperBuilder (RuleContext ruleContext ) {
41
- BazelConfiguration .Options bazelOptions =
42
- ruleContext .getConfiguration ().getOptions ().get (BazelConfiguration .Options .class );
43
-
44
- if (bazelOptions .removeExecTools
45
- && ruleContext .attributes ().has ("exec_tools" , BuildType .LABEL_LIST )
46
- && !ruleContext .attributes ().get ("exec_tools" , BuildType .LABEL_LIST ).isEmpty ()) {
47
- ruleContext .attributeError (
48
- "exec_tools" , "genrule.exec_tools has been removed, use tools instead" );
49
- }
50
-
51
39
return CommandHelper .builder (ruleContext )
52
40
.addToolDependencies ("tools" )
53
41
.addToolDependencies ("exec_tools" )
You can’t perform that action at this time.
0 commit comments