Don't do validate inclusions check on objc module maps

RELNOTES: None PiperOrigin-RevId: 282706702
bazelbuild · Nov 27, 2019 · f26b0ff · f26b0ff
1 parent 9d14ebd
commit f26b0ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -973,6 +973,11 @@ public void validateInclusions(
       if (input.isFileType(CppFileTypes.CPP_MODULE)) {
         continue;
       }
+      // TODO(b/145253507): Exclude objc module maps from check, due to bad interaction with
+      // local_objc_modules feature.
+      if (input.isFileType(CppFileTypes.OBJC_MODULE_MAP)) {
+        continue;
+      }
       if (allowedIncludes.contains(input)) {
         continue;
       }

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppFileTypes.java
@@ -199,6 +199,7 @@ public boolean apply(String path) {
 
   public static final FileType CPP_MODULE_MAP = FileType.of(".cppmap");
   public static final FileType CPP_MODULE = FileType.of(".pcm");
+  public static final FileType OBJC_MODULE_MAP = FileType.of("module.modulemap");
 
   /** Predicate that matches all artifacts that can be used in an objc Clang module map. */
   public static final Predicate<Artifact> MODULE_MAP_HEADER =