Remove unnecessary setter RELNOTES: None. PiperOrigin-RevId: 214448620
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java index e6747a4..b3e4434 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
@@ -22,7 +22,6 @@ import com.google.devtools.build.lib.rules.cpp.AspectLegalCppSemantics; import com.google.devtools.build.lib.rules.cpp.CcCompilationContext; import com.google.devtools.build.lib.rules.cpp.CppCompileActionBuilder; -import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode; import com.google.devtools.build.lib.rules.cpp.IncludeProcessing; import com.google.devtools.build.lib.rules.cpp.NoProcessing; @@ -42,7 +41,6 @@ public void finalizeCompileActionBuilder( RuleContext ruleContext, CppCompileActionBuilder actionBuilder) { actionBuilder - .setCppConfiguration(ruleContext.getFragment(CppConfiguration.class)) // Because Bazel does not support include scanning, we need the entire crosstool filegroup, // including header files, as opposed to just the "compile" filegroup. .addTransitiveMandatoryInputs(actionBuilder.getToolchain().getCrosstool())
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java index 4ac5cc9..e60f246 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileActionBuilder.java
@@ -481,11 +481,6 @@ return this; } - public CppCompileActionBuilder setCppConfiguration(CppConfiguration cppConfiguration) { - this.cppConfiguration = cppConfiguration; - return this; - } - public CppCompileActionBuilder setActionClassId(UUID uuid) { this.actionClassId = uuid; return this;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java index 1e52447..ff0be51 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java
@@ -74,7 +74,6 @@ .setInputsForInvalidation(inputsForInvalidation) .setBuiltinIncludeFiles(buildInfoHeaderArtifacts) .addMandatoryInputs(nonCodeInputs) - .setCppConfiguration(cppConfiguration) .setShareable(true) .setShouldScanIncludes(false) .setActionName(CppActionNames.LINKSTAMP_COMPILE);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java index 3296fbc..9ecad90 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCppSemantics.java
@@ -26,7 +26,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.rules.cpp.CcCompilationContext; import com.google.devtools.build.lib.rules.cpp.CppCompileActionBuilder; -import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode; import com.google.devtools.build.lib.rules.cpp.CppFileTypes; import com.google.devtools.build.lib.rules.cpp.CppSemantics; @@ -90,7 +89,6 @@ public void finalizeCompileActionBuilder( RuleContext ruleContext, CppCompileActionBuilder actionBuilder) { actionBuilder - .setCppConfiguration(ruleContext.getFragment(CppConfiguration.class)) // Because Bazel does not support include scanning, we need the entire crosstool filegroup, // including header files, as opposed to just the "compile" filegroup. .addTransitiveMandatoryInputs(actionBuilder.getToolchain().getCrosstool())