aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-08-31 10:59:41 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-08-31 14:51:52 +0000
commit5b261d5ae723165b0d716b865612afcff1d48cd1 (patch)
tree04ad198f8e51c08c7b3a65bf46a7f2365ca7e641 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
parent4d144f4fced4c8972b88ffc111f8486896a47e5f (diff)
Remove the "cc_*.includes attribute must refer to the third_party directory" warning from Bazel.
This behavior doesn't really make sense except within Google. Fixes #1286. -- MOS_MIGRATED_REVID=131813322
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index 50903b55c4..a02a0038d0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -29,7 +29,6 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.packages.BuildType;
-import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.rules.apple.Platform;
import com.google.devtools.build.lib.rules.cpp.CcLibraryHelper.SourceCategory;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
@@ -418,18 +417,6 @@ public final class CcCommon {
+ "' not below the relative path of its package '"
+ packageFragment
+ "'. This will be an error in the future");
- // TODO(janakr): Add a link to a page explaining the problem and fixes?
- } else if (packageIdentifier.getRepository().isMain()
- && !includesPath.startsWith(RuleClass.THIRD_PARTY_PREFIX)) {
- ruleContext.attributeWarning(
- "includes",
- "'"
- + includesAttr
- + "' resolves to '"
- + includesPath
- + "' not in '"
- + RuleClass.THIRD_PARTY_PREFIX
- + "'. This will be an error in the future");
}
result.add(includesPath);
result.add(ruleContext.getConfiguration().getGenfilesFragment().getRelative(includesPath));