8000 Delete unused `java_common.compile()` code · coderabbit-test/bazel@a95f37b · GitHub
[go: up one dir, main page]

Skip to content

Commit a95f37b

Browse files
hvadehracopybara-github
authored andcommitted
Delete unused java_common.compile() code
PiperOrigin-RevId: 554915536 Change-Id: Ic86acddbe30caff5efc1e46ffa39db79ca0a7d25
1 parent 33c85d1 commit a95f37b

File tree

8 files changed

+24
-1111
lines changed

8 files changed

+24
-1111
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ java_library(
3838
"//src/main/java/com/google/devtools/build/lib/analysis:actions/custom_command_line",
3939
"//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
4040
"//src/main/java/com/google/devtools/build/lib/analysis:config/build_configuration",
41+
"//src/main/java/com/google/devtools/build/lib/analysis:config/core_option_converters",
4142
"//src/main/java/com/google/devtools/build/lib/analysis:config/execution_transition_factory",
4243
"//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/no_transition",
4344
"//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
@@ -52,10 +53,8 @@ java_library(
5253
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
5354
"//src/main/java/com/google/devtools/build/lib/concurrent",
5455
"//src/main/java/com/google/devtools/build/lib/packages",
55-
"//src/main/java/com/google/devtools/build/lib/packages:exec_group",
5656
"//src/main/java/com/google/devtools/build/lib/packages/semantics",
5757
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
58-
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi",
5958
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core",
6059
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp",
6160
"//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java",
@@ -95,8 +94,6 @@ java_library(
9594
"JavaHeaderCompileAction.java",
9695
"JavaHelper.java",
9796
"JavaInfo.java",
98-
"JavaInfoBuildHelper.java",
99-
"JavaLibraryHelper.java",
10097
"JavaModuleFlagsProvider.java",
10198
"JavaOptions.java",
10299
"JavaPackageConfigurationProvider.java",

src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ public boolean usesAnnotationProcessing() {
603603
return getJavacOpts().contains("-processor") || attributes.plugins().hasProcessors();
604604
}
605605

606-
public void createGenJarAction(
606+
private void createGenJarAction(
607607
Artifact classJar,
608608
Artifact manifestProto,
609609
Artifact genClassJar,
@@ -663,36 +663,6 @@ private void createResourceJarAction(Artifact resourceJar, ImmutableList<Artifac
663663
.build(semantics, ruleContext, execGroup);
664664
}
665665

666-
/**
667-
* Creates an Action that packages the Java source files into a Jar. If {@code gensrcJar} is
668-
* non-null, includes the contents of the {@code gensrcJar} with the output source jar.
669-
*
670-
* @param outputJar the Artifact to create with the Action
671-
* @param gensrcJar the generated sources jar Artifact that should be included with the sources in
672-
* the output Artifact. May be null.
673-
* @param javaToolchainProvider is used by SingleJarActionBuilder to retrieve jvm options
674-
*/
675-
public void createSourceJarAction(
676-
Artifact outputJar,
677-
@Nullable Artifact gensrcJar,
678-
JavaToolchainProvider javaToolchainProvider) {
679-
JavaTargetAttributes attributes = getAttributes();
680-
NestedSetBuilder<Artifact> resourceJars = NestedSetBuilder.stableOrder();
681-
resourceJars.addAll(attributes.getSourceJars());
682-
if (gensrcJar != null) {
683-
resourceJars.add(gensrcJar);
684-
}
685-
SingleJarActionBuilder.createSourceJarAction(
686-
ruleContext,
687-
ruleContext,
688-
semantics,
689-
NestedSetBuilder.<Artifact>wrap(Order.STABLE_ORDER, attributes.getSourceFiles()),
690-
resourceJars.build(),
691-
outputJar,
692-
javaToolchainProvider,
693-
execGroup);
694-
}
695-
696666
public void createSourceJarAction(Artifact outputJar, @Nullable Artifact gensrcJar) {
697667
JavaTargetAttributes attributes = getAttributes();
698668
NestedSetBuilder<Artifact> resourceJars = NestedSetBuilder.stableOrder();
@@ -746,7 +716,7 @@ public Artifact createCompileTimeJarAction(
746716
return jar;
747717
}
748718

749-
public void createLocalOptimizationAction(
719+
private void createLocalOptimizationAction(
750720
Artifact unoptimizedOutputJar,
751721
Artifact optimizedOutputJar,
752722
NestedSet<Artifact> classpath,
@@ -847,7 +817,7 @@ public void addLibrariesToAttributes(Collection<? extends TransitiveInfoCollecti
847817
*
848818
* @return filtered command line flag value, defaulting to ERROR
849819
*/
850-
public StrictDepsMode getStrictJavaDeps() {
820+
private StrictDepsMode getStrictJavaDeps() {
851821
return strictJavaDeps;
852822
}
853823

src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java

Lines changed: 0 additions & 295 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0