diff options
| author |  Laurent Le Brun <laurentlb@google.com> | 2016-06-17 13:36:24 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-06-20 09:34:06 +0000 |
| commit | f3cf98faa44f3b647956868422a11074aff0e9ee (patch) | |
| tree | 93a361a853b3ebccd0af7074c993c29618ddf0e4 /src/main/java/com/google/devtools/build/lib/rules/android/JackCompilationHelper.java | |
| parent | 48f2470b3cc60c11e46a95872a409341c4224096 (diff) | |
Rollback of commit bdfd58a8ca2ed5735d6aaa5b238fb0f689515724.
--
MOS_MIGRATED_REVID=125160288
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 |