diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java index 130f7a87ba..c067d366aa 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java @@ -432,11 +432,11 @@ public final class JackCompilationHelper { */ private Artifact postprocessPartialJackAndAddResources( Artifact partialJackLibrary, Artifact resources) { - PathFragment partialPath = new PathFragment( - partialJackLibrary.getRootRelativePath().getPathString() - .replace(PARTIAL_JACK_DIRECTORY, JACK_DIRECTORY)); - Artifact result = ruleContext.getDerivedArtifact( - partialPath, ruleContext.getBinOrGenfilesDirectory()); + Artifact result = ruleContext.getUniqueDirectoryArtifact( + JACK_DIRECTORY, + partialJackLibrary.getRootRelativePath().relativeTo( + ruleContext.getUniqueDirectory(PARTIAL_JACK_DIRECTORY)), + ruleContext.getBinOrGenfilesDirectory()); CustomCommandLine.Builder builder = CustomCommandLine.builder() // Have jack double-check its behavior and crash rather than producing invalid output |