Updates AndroidResourceProcessingAction and AarGeneratorAction to use temp directories so that their files don't conflict with subsequent or concurrent invocations of those actions.

--
MOS_MIGRATED_REVID=98848810

1 files changed, 7 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
index 900cab6330..c42e0f5f56 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AarGeneratorAction.java
@@ -143,11 +143,16 @@ public class AarGeneratorAction {
       resourcesOut.toFile().deleteOnExit();
       Path assetsOut = Files.createTempDirectory("tmp-assets");
       assetsOut.toFile().deleteOnExit();
+      Path expandedOut = Files.createTempDirectory("tmp-expanded");
+      expandedOut.toFile().deleteOnExit();
+      Path deduplicatedOut = Files.createTempDirectory("tmp-deduplicated");
+      deduplicatedOut.toFile().deleteOnExit();
+
       logger.fine(String.format("Setup finished at %dms", timer.elapsed(TimeUnit.MILLISECONDS)));
 
       ImmutableList<DirectoryModifier> modifiers = ImmutableList.of(
-          new PackedResourceTarExpander(working.resolve("expanded"), working),
-          new FileDeDuplicator(Hashing.murmur3_128(), working.resolve("deduplicated"), working));
+          new PackedResourceTarExpander(expandedOut, working),
+          new FileDeDuplicator(Hashing.murmur3_128(), deduplicatedOut, working));
       MergedAndroidData mergedData = resourceProcessor.mergeData(options.mainData,
           options.dependencyData,
           resourcesOut,