Remove --experimental_disable_cc_context_quote_includes_hook
And the code that this retains. Yay for being one step closer to C++ rules unification.
RELNOTES: None.
PiperOrigin-RevId: 243826251
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 c55d1a8..2ebcd2c 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
@@ -345,7 +345,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 83d08bf..b93932a 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
@@ -165,7 +165,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 92479b5..712b5e8 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
@@ -168,7 +168,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/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index afddfa4..ecbbb3b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -647,10 +647,6 @@
return cppOptions.dontEnableHostNonhost;
}
- public boolean disableCcContextQuoteIncludesHook() {
- return cppOptions.disableCcContextQuoteIncludesHook;
- }
-
public boolean requireCtxInConfigureFeatures() {
return cppOptions.requireCtxInConfigureFeatures;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index af39bbf..982457a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -725,14 +725,6 @@
public boolean useLLVMCoverageMapFormat;
@Option(
- name = "experimental_disable_cc_context_quote_includes_hook",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
- effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
- metadataTags = {OptionMetadataTag.EXPERIMENTAL})
- public boolean disableCcContextQuoteIncludesHook;
-
- @Option(
name = "incompatible_dont_enable_host_nonhost_crosstool_features",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
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 b2a02ef..bd6d316 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 6a8f907..803506f 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);
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 a9d67dc..541f074 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
@@ -34,8 +34,6 @@
import com.google.devtools.build.lib.rules.cpp.IncludeProcessing;
import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.util.FileTypeSet;
-import com.google.devtools.build.lib.vfs.PathFragment;
-import java.util.List;
/**
* CppSemantics for objc builds.
@@ -131,11 +129,6 @@
}
@Override
- public List<PathFragment> getQuoteIncludes(RuleContext ruleContext) {
- return ImmutableList.of();
- }
-
- @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);
}
