Collect all the temporary directories into one tree that will delete on exit.

--
MOS_MIGRATED_REVID=114115143

1 files changed, 8 insertions, 11 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
index 31bbdbfae5..646b8389ee 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java
@@ -283,24 +283,21 @@ public class AndroidResourceProcessingAction {
     options = optionsParser.getOptions(Options.class);
     FileSystem fileSystem = FileSystems.getDefault();
     Path working = fileSystem.getPath("").toAbsolutePath();
-    Path mergedAssets = working.resolve("merged_assets");
-    Path mergedResources = working.resolve("merged_resources");
-
     final AndroidResourceProcessor resourceProcessor =
         new AndroidResourceProcessor(STD_LOGGER);
 
     try {
-
-      Path expandedOut = Files.createTempDirectory("tmp-expanded");
-      expandedOut.toFile().deleteOnExit();
-      Path deduplicatedOut = Files.createTempDirectory("tmp-deduplicated");
-      deduplicatedOut.toFile().deleteOnExit();
+      final Path tmp = Files.createTempDirectory("android_resources_tmp");
+      tmp.toFile().deleteOnExit();
+      final Path expandedOut = tmp.resolve("tmp-expanded");
+      final Path deduplicatedOut = tmp.resolve("tmp-deduplicated");
+      final Path mergedAssets = tmp.resolve("merged_assets");
+      final Path mergedResources = tmp.resolve("merged_resources");
 
       Path generatedSources = null;
       if (options.srcJarOutput != null || options.rOutput != null
           || options.symbolsTxtOut != null) {
-        generatedSources = Files.createTempDirectory("generated_resources");
-        generatedSources.toFile().deleteOnExit();
+        generatedSources = tmp.resolve("generated_resources");
       }
 
       LOGGER.fine(String.format("Setup finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS)));
@@ -350,7 +347,7 @@ public class AndroidResourceProcessingAction {
           options.versionName,
           filteredData,
           data,
-          working.resolve("manifest"),
+          tmp.resolve("processed_manifest"),
           generatedSources,
           options.packagePath,
           options.proguardOutput,