Skylark aspects should always output to bin directory.

--
MOS_MIGRATED_REVID=120539216

1 files changed, 12 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
index bb12bb45ba..e83f409bc5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
@@ -567,13 +567,23 @@ public final class SkylarkRuleContext {
     }
   }
 
+  private boolean isForAspect() {
+    return ruleAttributesCollection != null;
+  }
+
   @SkylarkCallable(
     doc =
         "Creates a file object with the given filename, in the current package. "
             + DOC_NEW_FILE_TAIL
   )
   public Artifact newFile(String filename) {
-    return newFile(ruleContext.getBinOrGenfilesDirectory(), filename);
+    return newFile(newFileRoot(), filename);
+  }
+
+  private Root newFileRoot() {
+    return isForAspect()
+        ? getConfiguration().getBinDirectory()
+        : ruleContext.getBinOrGenfilesDirectory();
   }
 
   // Kept for compatibility with old code.
@@ -588,8 +598,7 @@ public final class SkylarkRuleContext {
   public Artifact newFile(Artifact baseArtifact, String newBaseName) {
     PathFragment original = baseArtifact.getRootRelativePath();
     PathFragment fragment = original.replaceName(newBaseName);
-    Root root = ruleContext.getBinOrGenfilesDirectory();
-    return ruleContext.getDerivedArtifact(fragment, root);
+    return ruleContext.getDerivedArtifact(fragment, newFileRoot());
   }
 
   // Kept for compatibility with old code.