Better use of output paths

Author: shs96c

src/org/openqa/selenium/buck/file/Folder.java

@@ -59,10 +59,7 @@ protected Folder(
     super(target, filesystem, ruleFinder, Folder.class);
 
     this.folderName = Preconditions.checkNotNull(folderName);
-    this.output = new OutputPath(BuildTargets.getGenPath(
-        getProjectFilesystem(),
-        target,
-        String.format("%s/%%s.src.zip", target.getShortName())));
+    this.output = new OutputPath(String.format("%s.src.zip", target.getShortName()));
     this.srcs = srcs.stream().map(InputPath::new).collect(MoreCollectors.toImmutableSortedSet());
   }
 

src/org/openqa/selenium/buck/mozilla/Xpi.java

@@ -76,12 +76,7 @@ public Xpi(
     this.resources = resources.stream().map(InputPath::new).collect(MoreCollectors.toImmutableSortedSet());
     this.platforms = platforms.stream().map(InputPath::new).collect(MoreCollectors.toImmutableSortedSet());
 
-    this.output = new OutputPath(BuildTargets.getGenPath(
-        getProjectFilesystem(),
-        getBuildTarget(),
-        String.format("%%s/%s.xpi", getBuildTarget().getShortName())));
-
-
+    this.output = new OutputPath(String.format("%s.xpi", getBuildTarget().getShortName()));
   }
 
   @Override