Automated rollback of commit 3ea6c18a623d6495a81f12baace40d3bc8a72bbe.

*** Reason for rollback ***

Breaks non-Rabbit builds, see b/111275650.

*** Original change description ***

Avoid long, duplicated directory structures. In the common case, generated
files are going to be beneath the target that generates them. In this case,
don't duplicated the package's path.

RELNOTES: None.
PiperOrigin-RevId: 204084475

1 files changed, 1 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
index 8574da0087..ce5eef15f5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java
@@ -592,16 +592,8 @@ public class CppHelper {
 
   private static Artifact getIncludesOutput(RuleContext ruleContext, Artifact src) {
     Preconditions.checkArgument(!src.isSourceArtifact(), src);
-    PathFragment pkgPath = ruleContext.getLabel().getPackageFragment();
-    PathFragment fileName = src.getRootRelativePath();
-    if (fileName.startsWith(pkgPath)) {
-      // In most cases actions grep the includes of files that they create and that are located
-      // within their own package. In this case, don't duplicate the package path underneath the
-      // actions genfiles directory.
-      fileName = fileName.relativeTo(pkgPath);
-    }
     return ruleContext.getGenfilesArtifact(
-        fileName.replaceName(src.getFilename() + GREPPED_INCLUDES_SUFFIX));
+        src.getRootRelativePath().replaceName(src.getFilename() + GREPPED_INCLUDES_SUFFIX));
   }
 
   /**