Include generateSubmodules in the cache key.

--
MOS_MIGRATED_REVID=89149156

2 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMap.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMap.java
index bb272098a4..8c15de065c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMap.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMap.java
@@ -21,6 +21,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
  */
 @Immutable
 public class CppModuleMap {
+  // NOTE: If you add a field here, you'll likely need to update CppModuleMapAction.computeKey().
   private final Artifact artifact;
   private final String name;
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
index a5b5a7ec0a..e63471276d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java
@@ -50,7 +50,8 @@ public class CppModuleMapAction extends AbstractFileWriteAction {
    */
   private final boolean moduleMapHomeIsCwd;
 
-  // Headers and dependencies list
+  // Data required to build the actual module map.
+  // NOTE: If you add a field here, you'll likely need to add it to the cache key in computeKey().
   private final ImmutableList<Artifact> privateHeaders;
   private final ImmutableList<Artifact> publicHeaders;
   private final ImmutableList<CppModuleMap> dependencies;
@@ -176,6 +177,7 @@ public class CppModuleMapAction extends AbstractFileWriteAction {
     f.addString(cppModuleMap.getName());
     f.addBoolean(moduleMapHomeIsCwd);
     f.addBoolean(compiledModule);
+    f.addBoolean(generateSubmodules);
     return f.hexDigestAndReset();
   }