Roll forward of commit 1f1f207573c7b9c3e2d3ca1ffb0780a8fd592214: action to write R classes directly

NEW: add check that primary R.txt exists before
trying to load its symbols.

Rollback of commit 32c6c15c8b9bc4e203529f60bedbc5cd8a496a36.

*** Reason for rollback ***

Rollforward with check that primary R.txt exists

*** Original change description ***

Automated [] rollback of commit 1f1f207573c7b9c3e2d3ca1ffb0780a8fd592214.

*** Reason for rollback ***

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

--
MOS_MIGRATED_REVID=125559472

1 files changed, 9 insertions, 11 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 f84783a90b..711c97677e 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
@@ -124,7 +124,7 @@ public class AarGeneratorAction {
     public boolean strictMerge;
   }
 
-  public static void main(String[] args) {
+  public static void main(String[] args) throws IOException {
     Stopwatch timer = Stopwatch.createStarted();
     OptionsParser optionsParser = OptionsParser.newOptionsParser(Options.class);
     optionsParser.parseAndExitUponError(args);
@@ -138,15 +138,14 @@ public class AarGeneratorAction {
     AndroidResourceProcessor resourceProcessor = new AndroidResourceProcessor(
         new StdLogger(com.android.utils.StdLogger.Level.VERBOSE));
 
-    try {
-      Path resourcesOut = Files.createTempDirectory("tmp-resources");
-      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();
+    try (ScopedTemporaryDirectory scopedTmp = new ScopedTemporaryDirectory("aar_gen_tmp")) {
+      Path tmp = scopedTmp.getPath();
+      Path resourcesOut = tmp.resolve("merged_resources");
+      Files.createDirectories(resourcesOut);
+      Path assetsOut = tmp.resolve("merged_assets");
+      Files.createDirectories(assetsOut);
+      Path expandedOut = tmp.resolve("tmp-expanded");
+      Path deduplicatedOut = tmp.resolve("tmp-deduplicated");
 
       logger.fine(String.format("Setup finished at %dms", timer.elapsed(TimeUnit.MILLISECONDS)));
 
@@ -165,7 +164,6 @@ public class AarGeneratorAction {
       writeAar(options.aarOutput, mergedData, options.manifest, options.rtxt, options.classes);
       logger.fine(
           String.format("Packaging finished at %dms", timer.elapsed(TimeUnit.MILLISECONDS)));
-
     } catch (IOException | MergingException e) {
       logger.log(Level.SEVERE, "Error during merging resources", e);
       System.exit(1);