Rollback of commit 1f1f207573c7b9c3e2d3ca1ffb0780a8fd592214.

*** Reason for rollback ***

Doesn't handle aapt that doesn't generate R.txt properly.

--
MOS_MIGRATED_REVID=125405481

1 files changed, 6 insertions, 3 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 69f58d6fbb..373f1612e1 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
@@ -40,6 +40,7 @@ import com.android.utils.StdLogger;
 import java.io.IOException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -216,9 +217,11 @@ public class AndroidResourceProcessingAction {
     Path working = fileSystem.getPath("").toAbsolutePath();
     final AndroidResourceProcessor resourceProcessor = new AndroidResourceProcessor(STD_LOGGER);
 
-    try (ScopedTemporaryDirectory scopedTmp =
-        new ScopedTemporaryDirectory("android_resources_tmp")) {
-      final Path tmp = scopedTmp.getPath();
+    try {
+      final Path tmp = Files.createTempDirectory("android_resources_tmp");
+      // Clean up the tmp file on exit to keep diskspace low.
+      tmp.toFile().deleteOnExit();
+
       final Path expandedOut = tmp.resolve("tmp-expanded");
       final Path deduplicatedOut = tmp.resolve("tmp-deduplicated");
       final Path mergedAssets = tmp.resolve("merged_assets");