aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2018-07-23 06:32:10 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-07-23 06:33:11 -0700
commit0ddd7dc8a338c4464ab3f032711f009905cd42f6 (patch)
tree5a2d5dc251cf810a1e9a1161195e8db4a323d384 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
parent2331038a4dde81eedfb10d4bdda02ca48622c81d (diff)
Remove "warn" setting for hdrs_check. This has not proven useful.
For now, implicitly convert "warn" to "loose". RELNOTES: None. PiperOrigin-RevId: 205652060
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
index 09ea9f6596..1aef25f201 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -587,8 +587,7 @@ public final class CcCompilationHelper {
/**
* Sets the given directories to by loose include directories that are only allowed to be
- * referenced when headers checking is {@link HeadersCheckingMode#LOOSE} or {@link
- * HeadersCheckingMode#WARN}.
+ * referenced when headers checking is {@link HeadersCheckingMode#LOOSE}.
*/
private void setLooseIncludeDirs(Set<PathFragment> looseIncludeDirs) {
this.looseIncludeDirs = looseIncludeDirs;
@@ -983,13 +982,7 @@ public final class CcCompilationHelper {
// Add this package's dir to declaredIncludeDirs, & this rule's headers to declaredIncludeSrcs
// Note: no include dir for STRICT mode.
- if (headersCheckingMode == HeadersCheckingMode.WARN) {
- ccCompilationContextBuilder.addDeclaredIncludeWarnDir(
- ruleContext.getLabel().getPackageFragment());
- for (PathFragment looseIncludeDir : looseIncludeDirs) {
- ccCompilationContextBuilder.addDeclaredIncludeWarnDir(looseIncludeDir);
- }
- } else if (headersCheckingMode == HeadersCheckingMode.LOOSE) {
+ if (headersCheckingMode == HeadersCheckingMode.LOOSE) {
ccCompilationContextBuilder.addDeclaredIncludeDir(
ruleContext.getLabel().getPackageFragment());
for (PathFragment looseIncludeDir : looseIncludeDirs) {