Fix layering_check with cc_fake_binary / no-compile tests.

A cc_fake_binary needs all additional artifacts referenced in the compile
command line in its runfiles tree.

RELNOTES: Fix layering_check with cc_fake_binary.

--
MOS_MIGRATED_REVID=86596049

1 files changed, 3 insertions, 0 deletions

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 6efcd9daeb..b0882c677d 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
@@ -137,6 +137,9 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory {
       builder.addSymlinksToArtifacts(
           Iterables.transform(common.getCAndCppSources(), Pair.<Artifact, Label>firstFunction()));
       builder.addSymlinksToArtifacts(cppCompilationContext.getDeclaredIncludeSrcs());
+      // Add additional files that are referenced from the compile command, like module maps
+      // or header modules.
+      builder.addSymlinksToArtifacts(cppCompilationContext.getAdditionalInputs());
     }
     return builder.build();
   }