commit 2498419411985d96432063d19b5feffaf7709e7f
author djasper <djasper@google.com> Wed Jan 13 01:19:23 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Jan 13 01:20:27 2021 -0800
tree 92e93cbe596d53f2e80297f87bdeeeb23e4dd1e6
parent 7d7ceaec50c84480617e22707304c975d8dc2940

Do not create parse_headers actions for headers that are also compiled into a
C++ module. The module build step already verifies that the header can be built.

RELNOTES: None.
PiperOrigin-RevId: 351535871

src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java

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 fde0e86..d290da8d 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
@@ -453,6 +453,7 @@
 
     if (shouldProcessHeaders
         && ccToolchain.shouldProcessHeaders(featureConfiguration, cppConfiguration)
+        && !shouldProvideHeaderModules()
         && !isTextualInclude) {
       compilationUnitSources.put(
           privateHeader, CppSource.create(privateHeader, label, CppSource.Type.HEADER));
@@ -511,7 +512,8 @@
     if (!shouldProcessHeaders
         || isTextualInclude
         || !isHeader
-        || !ccToolchain.shouldProcessHeaders(featureConfiguration, cppConfiguration)) {
+        || !ccToolchain.shouldProcessHeaders(featureConfiguration, cppConfiguration)
+        || shouldProvideHeaderModules()) {
       return;
     }