|
21 | 21 | import com.google.devtools.build.lib.collect.nestedset.Depset.TypeException; |
22 | 22 | import com.google.devtools.build.lib.packages.Info; |
23 | 23 | import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; |
24 | | -import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions; |
25 | 24 | import com.google.devtools.build.lib.starlarkbuildapi.FileApi; |
26 | 25 | import com.google.devtools.build.lib.starlarkbuildapi.StarlarkActionFactoryApi; |
27 | 26 | import com.google.devtools.build.lib.starlarkbuildapi.StarlarkRuleContextApi; |
@@ -77,21 +76,6 @@ default JavaInfoT mergeJavaProviders(Sequence<?> providers /* <JavaInfoT> expect |
77 | 76 | + "At least one of parameters output_jar or output_source_jar is required.", |
78 | 77 | parameters = { |
79 | 78 | @Param(name = "actions", named = true, doc = "ctx.actions"), |
80 | | - @Param( |
81 | | - name = "output_jar", |
82 | | - positional = false, |
83 | | - named = true, |
84 | | - allowedTypes = { |
85 | | - @ParamType(type = FileApi.class), |
86 | | - @ParamType(type = NoneType.class), |
87 | | - }, |
88 | | - defaultValue = "None", |
89 | | - doc = |
90 | | - "Deprecated: The output jar of the rule. Used to name the resulting source jar. " |
91 | | - + "The parameter sets output_source_jar parameter to `{output_jar}-src.jar`." |
92 | | - + "Use output_source_jar parameter directly instead.", |
93 | | - disableWithFlag = BuildLanguageOptions.INCOMPATIBLE_JAVA_COMMON_PARAMETERS, |
94 | | - valueWhenDisabled = "None"), |
95 | 79 | @Param( |
96 | 80 | name = "output_source_jar", |
97 | 81 | positional = false, |
@@ -121,25 +105,13 @@ default JavaInfoT mergeJavaProviders(Sequence<?> providers /* <JavaInfoT> expect |
121 | 105 | positional = false, |
122 | 106 | named = true, |
123 | 107 | doc = "A JavaToolchainInfo to used to find the ijar tool."), |
124 | | - @Param( |
125 | | - name = "host_javabase", |
126 | | - positional = false, |
127 | | - named = true, |
128 | | - doc = |
129 | | - "Deprecated: You can drop this parameter (host_javabase is provided with " |
130 | | - + "java_toolchain)", |
131 | | - defaultValue = "None", |
132 | | - disableWithFlag = BuildLanguageOptions.INCOMPATIBLE_JAVA_COMMON_PARAMETERS, |
133 | | - valueWhenDisabled = "None"), |
134 | 108 | }) |
135 | 109 | default FileApi packSources( |
136 | 110 | StarlarkActionFactoryT actions, |
137 | | - Object outputJar, |
138 | 111 | Object outputSourceJar, |
139 | 112 | Sequence<?> sourceFiles, // <FileT> expected. |
140 | 113 | Sequence<?> sourceJars, // <FileT> expected. |
141 | | - Info javaToolchain, |
142 | | - Object hostJavabase) |
| 114 | + Info javaToolchain) |
143 | 115 | throws EvalException { |
144 | 116 | throw new UnsupportedOperationException(); |
145 | 117 | } |
@@ -352,16 +324,6 @@ default FileApi runIjar( |
352 | 324 | doc = |
353 | 325 | "A BootClassPathInfo to be used for this compilation. If present, overrides the" |
354 | 326 | + " bootclasspath associated with the provided java_toolchain."), |
355 | | - @Param( |
356 | | - name = "host_javabase", |
357 | | - positional = false, |
358 | | - named = true, |
359 | | - doc = |
360 | | - "Deprecated: You can drop this parameter (host_javabase is provided with " |
361 | | - + "java_toolchain)", |
362 | | - defaultValue = "None", |
363 | | - disableWithFlag = BuildLanguageOptions.INCOMPATIBLE_JAVA_COMMON_PARAMETERS, |
364 | | - valueWhenDisabled = "None"), |
365 | 327 | @Param( |
366 | 328 | name = "sourcepath", |
367 | 329 | positional = false, |
@@ -462,7 +424,6 @@ default JavaInfoT createJavaCompileAction( |
462 | 424 | String strictDepsMode, |
463 | 425 | Info javaToolchain, |
464 | 426 | Object bootClassPath, |
465 | | - Object hostJavabase, |
466 | 427 | Sequence<?> sourcepathEntries, // <FileT> expected. |
467 | 428 | Sequence<?> resources, // <FileT> expected. |
468 | 429 | Sequence<?> resourceJars, // <FileT> expected. |
|
0 commit comments