Automated g4 rollback of commit 3c0bb56a74478cff675b636d5bf605a652451739.

*** Reason for rollback ***

Rolling forward with a fix to avoid writing all resources to empty libraries.

*** Original change description ***

Automated g4 rollback of commit bdf0230534a59dab954ee76c5bf640394c88984e.

*** Reason for rollback ***

Causes issues with library R generation.

*** Original change description ***

Refactor the RClassGenerator to be reusable for different packages.

RELNOTES: None
PiperOrigin-RevId: 154175593

1 files changed, 5 insertions, 13 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
index a9243d2584..d86861649b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessor.java
@@ -544,23 +544,15 @@ public class AndroidResourceProcessor {
       Path classesOut,
       boolean finalFields)
       throws IOException {
-    for (String packageName : libMap.keySet()) {
-      Collection<ResourceSymbols> symbols = libMap.get(packageName);
-      RClassGenerator classWriter = RClassGenerator.fromSymbols(
-          classesOut, packageName, fullSymbolValues, symbols, finalFields);
-      classWriter.write();
+    RClassGenerator classWriter =
+        RClassGenerator.fromSymbols(classesOut, fullSymbolValues, finalFields);
+    for (String packageName : libMap.keySet()) { 
+      classWriter.write(packageName, ResourceSymbols.merge(libMap.get(packageName)).asFilterMap());
     }
     if (appPackageName != null) {
       // Unlike the R.java generation, we also write the app's R.class file so that the class
       // jar file can be complete (aapt doesn't generate it for us).
-      RClassGenerator classWriter =
-          RClassGenerator.fromSymbols(
-              classesOut,
-              appPackageName,
-              fullSymbolValues,
-              ImmutableList.of(fullSymbolValues),
-              finalFields);
-      classWriter.write();
+      classWriter.write(appPackageName);
     }
   }