Remove getQuoteIncludes hook from CppSemantics
It's no longer needed.
RELNOTES: None
PiperOrigin-RevId: 234117841
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 f266fee..657275d 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
@@ -14,7 +14,6 @@
package com.google.devtools.build.lib.bazel.rules.cpp;
-import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -28,8 +27,6 @@
import com.google.devtools.build.lib.rules.cpp.IncludeProcessing;
import com.google.devtools.build.lib.rules.cpp.NoProcessing;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.devtools.build.lib.vfs.PathFragment;
-import java.util.List;
/** C++ compilation semantics. */
public class BazelCppSemantics implements AspectLegalCppSemantics {
@@ -54,11 +51,6 @@
}
@Override
- public List<PathFragment> getQuoteIncludes(RuleContext ruleContext) {
- return ImmutableList.of();
- }
-
- @Override
public NestedSet<Artifact> getAdditionalPrunableIncludes() {
return NestedSetBuilder.emptySet(Order.STABLE_ORDER);
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
index 311ac76..1cdcb4b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -332,7 +332,6 @@
.addCcCompilationContexts(CppHelper.getCompilationContextsFromDeps(deps))
.addCcCompilationContexts(
ImmutableList.of(CcCompilationHelper.getStlCcCompilationContext(ruleContext)))
- .addQuoteIncludeDirs(semantics.getQuoteIncludes(ruleContext))
.setHeadersCheckingMode(semantics.determineHeadersCheckingMode(ruleContext))
.setCodeCoverageEnabled(CcCompilationHelper.isCodeCoverageEnabled(ruleContext))
.setFake(fake);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
index f1bab33..6863f52 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
@@ -166,7 +166,6 @@
ccToolchain.getFdoContext())
.addPublicHeaders(common.getHeaders())
.setHeadersCheckingMode(HeadersCheckingMode.STRICT)
- .addQuoteIncludeDirs(semantics.getQuoteIncludes(ruleContext))
.setCodeCoverageEnabled(CcCompilationHelper.isCodeCoverageEnabled(ruleContext))
.compile();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
index 4a5b1e6..ba53de7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -161,7 +161,6 @@
.collect(ImmutableList.toImmutableList()))
.addCcCompilationContexts(
ImmutableList.of(CcCompilationHelper.getStlCcCompilationContext(ruleContext)))
- .addQuoteIncludeDirs(semantics.getQuoteIncludes(ruleContext))
.setHeadersCheckingMode(semantics.determineHeadersCheckingMode(ruleContext));
CcLinkingHelper linkingHelper =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
index 79f7fd9..8bfc0c8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -624,7 +624,6 @@
.addCcCompilationContexts(
ImmutableList.of(CcCompilationHelper.getStlCcCompilationContext(ruleContext)))
.setCodeCoverageEnabled(CcCompilationHelper.isCodeCoverageEnabled(ruleContext))
- .addQuoteIncludeDirs(cppSemantics.getQuoteIncludes(ruleContext))
.setPurpose(convertFromNoneable(purpose, null));
SkylarkNestedSet additionalCompilationInputs =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java
index 4760a53..37c20d1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppSemantics.java
@@ -20,8 +20,6 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode;
-import com.google.devtools.build.lib.vfs.PathFragment;
-import java.util.List;
/** Pluggable C++ compilation semantics. */
public interface CppSemantics {
@@ -37,14 +35,6 @@
CppCompileActionBuilder actionBuilder);
/**
- * Called before {@link CcCompilationContext}s are finalized.
- *
- * <p>Gives the semantics implementation the opportunity to change what the C++ rule propagates to
- * dependent rules.
- */
- List<PathFragment> getQuoteIncludes(RuleContext ruleContext);
-
- /**
* Returns the set of includes which are not mandatory and may be pruned by include processing.
*/
NestedSet<Artifact> getAdditionalPrunableIncludes();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
index ba9510b..893b550 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
@@ -308,8 +308,7 @@
toolchain.getFdoContext())
.addCcCompilationContexts(CppHelper.getCompilationContextsFromDeps(deps))
.addCcCompilationContexts(
- ImmutableList.of(CcCompilationHelper.getStlCcCompilationContext(ruleContext)))
- .addQuoteIncludeDirs(cppSemantics.getQuoteIncludes(ruleContext));
+ ImmutableList.of(CcCompilationHelper.getStlCcCompilationContext(ruleContext)));
// Don't instrument the generated C++ files even when --collect_code_coverage is set.
helper.setCodeCoverageEnabled(false);
return helper;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index a442a59..0dc1df8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -343,7 +343,8 @@
.setPropagateModuleMapToCompileAction(false)
.addVariableExtension(extension)
.setPurpose(purpose)
- .addQuoteIncludeDirs(semantics.getQuoteIncludes(ruleContext))
+ .addQuoteIncludeDirs(
+ ObjcCommon.userHeaderSearchPaths(objcProvider, ruleContext.getConfiguration()))
.setCodeCoverageEnabled(CcCompilationHelper.isCodeCoverageEnabled(ruleContext));
if (pchHdr != null) {
@@ -454,7 +455,8 @@
nonObjcArcCompilationInfo.getCcCompilationContext()));
ccCompilationContextBuilder.setPurpose(
String.format("%s_merged_arc_non_arc_objc", semantics.getPurpose()));
- ccCompilationContextBuilder.addQuoteIncludeDirs(semantics.getQuoteIncludes(ruleContext));
+ ccCompilationContextBuilder.addQuoteIncludeDirs(
+ ObjcCommon.userHeaderSearchPaths(objcProvider, ruleContext.getConfiguration()));
CcCompilationOutputs precompiledFilesObjects =
new CcCompilationOutputs.Builder()
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 592ef09..14c5865 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
@@ -33,8 +33,6 @@
import com.google.devtools.build.lib.rules.cpp.HeaderDiscovery.DotdPruningMode;
import com.google.devtools.build.lib.rules.cpp.IncludeProcessing;
import com.google.devtools.build.lib.util.FileTypeSet;
-import com.google.devtools.build.lib.vfs.PathFragment;
-import java.util.List;
/**
* CppSemantics for objc builds.
@@ -123,15 +121,6 @@
}
@Override
- public List<PathFragment> getQuoteIncludes(RuleContext ruleContext) {
- ImmutableList.Builder<PathFragment> quoteIncludes = ImmutableList.builder();
- // The genfiles root of each child configuration must be added to the compile action so that
- // generated headers can be resolved.
- return ImmutableList.copyOf(
- ObjcCommon.userHeaderSearchPaths(objcProvider, ruleContext.getConfiguration()));
- }
-
- @Override
public NestedSet<Artifact> getAdditionalPrunableIncludes() {
return objcProvider.get(HEADER);
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
index b929c40..8311cc6 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/MockCppSemantics.java
@@ -14,7 +14,6 @@
package com.google.devtools.build.lib.rules.cpp;
-import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.RuleContext;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -25,8 +24,6 @@
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
import com.google.devtools.build.lib.rules.cpp.CppConfiguration.HeadersCheckingMode;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.devtools.build.lib.vfs.PathFragment;
-import java.util.List;
/**
* Null-object like {@link CppSemantics} implementation. Only to be used in tests that don't depend
@@ -45,11 +42,6 @@
CppCompileActionBuilder actionBuilder) {}
@Override
- public List<PathFragment> getQuoteIncludes(RuleContext ruleContext) {
- return ImmutableList.of();
- }
-
- @Override
public NestedSet<Artifact> getAdditionalPrunableIncludes() {
return NestedSetBuilder.emptySet(Order.STABLE_ORDER);
}
