aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools
diff options
context:
space:
mode:
authorGravatar Manuel Klimek <klimek@google.com>2015-02-11 12:44:41 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-02-11 12:44:41 +0000
commit98f9af508cc3c4e1d66e459e12dd0bc78a536b12 (patch)
tree2b4c1e55881fa90239ba0624c2eb5d5f038bf275 /src/main/java/com/google/devtools
parent4a7cc46fc7452d4f7ec4a186b882b0a8232d336c (diff)
Fix cache key generation of CppModuleMapAction.
It was missing multiple members in its key computation. RELNOTES: Fix .cppmap file re-generation. -- MOS_MIGRATED_REVID=86074231
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java6
1 files changed, 6 insertions, 0 deletions
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 a350fc4618..a503f1f8d8 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
@@ -149,8 +149,14 @@ public class CppModuleMapAction extends AbstractFileWriteAction {
for (CppModuleMap dep : dependencies) {
f.addPath(dep.getArtifact().getExecPath());
}
+ f.addInt(additionalExportedHeaders.size());
+ for (PathFragment path : additionalExportedHeaders) {
+ f.addPath(path);
+ }
f.addPath(cppModuleMap.getArtifact().getExecPath());
f.addString(cppModuleMap.getName());
+ f.addBoolean(moduleMapHomeIsCwd);
+ f.addBoolean(compiledModule);
return f.hexDigestAndReset();
}