diff options
| author |  Manuel Klimek <klimek@google.com> | 2016-04-25 14:02:12 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2016-04-25 17:47:32 +0000 |
| commit | 8bc7f437258523fffc4946f99f6e20539d8782dc (patch) | |
| tree | da60a3596ce2dae61ad824073a828223fe14b3b4 /src/main/java/com/google/devtools/build/lib/rules/cpp | |
| parent | c55e9c760518af41f9e018ce90c9acb6d3791c59 (diff) | |
Fix cache invalidation problem in CppModuleMapAction.
When a file changes its execution root (for example, a previously checked in
file now becoming a generated file), the cache key would be the same, using
a broken module map.
--
MOS_MIGRATED_REVID=120703120
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppModuleMapAction.java | 4 |
1 files changed, 2 insertions, 2 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 3fea2c4c0a..183da379fc 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 @@ -177,11 +177,11 @@ public final class CppModuleMapAction extends AbstractFileWriteAction { f.addString(GUID); f.addInt(privateHeaders.size()); for (Artifact artifact : privateHeaders) { - f.addPath(artifact.getRootRelativePath()); + f.addPath(artifact.getExecPath()); } f.addInt(publicHeaders.size()); for (Artifact artifact : publicHeaders) { - f.addPath(artifact.getRootRelativePath()); + f.addPath(artifact.getExecPath()); } f.addInt(dependencies.size()); for (CppModuleMap dep : dependencies) { |