Use one writer for generating R.java source files

RELNOTES: None
PiperOrigin-RevId: 156205544

1 files changed, 5 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java b/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
index 7f8fff613f..fc6d7636ff 100644
--- a/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
+++ b/src/tools/android/java/com/google/devtools/build/android/PlaceholderIdFieldInitializerBuilder.java
@@ -23,6 +23,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
 import com.google.devtools.build.android.AndroidFrameworkAttrIdProvider.AttrLookupException;
 import com.google.devtools.build.android.resources.FieldInitializer;
+import com.google.devtools.build.android.resources.FieldInitializers;
 import com.google.devtools.build.android.resources.IntArrayFieldInitializer;
 import com.google.devtools.build.android.resources.IntFieldInitializer;
 import java.util.Collection;
@@ -325,8 +326,9 @@ class PlaceholderIdFieldInitializerBuilder {
     return allocatedTypeIds;
   }
 
-  public Map<ResourceType, List<FieldInitializer>> build() throws AttrLookupException {
-    Map<ResourceType, List<FieldInitializer>> initializers = new EnumMap<>(ResourceType.class);
+  public FieldInitializers build() throws AttrLookupException {
+    Map<ResourceType, Collection<FieldInitializer>> initializers =
+        new EnumMap<>(ResourceType.class);
     Map<ResourceType, Integer> typeIdMap = chooseTypeIds();
     Map<String, Integer> attrAssignments = assignAttrIds(typeIdMap.get(ResourceType.ATTR));
     for (Map.Entry<ResourceType, Set<String>> fieldEntries : innerClasses.entrySet()) {
@@ -347,7 +349,7 @@ class PlaceholderIdFieldInitializerBuilder {
       Preconditions.checkArgument(fields.size() < (1 << 16));
       initializers.put(type, fields);
     }
-    return initializers;
+    return FieldInitializers.copyOf(initializers);
   }
 
   private Map<ResourceType, Integer> chooseTypeIds() {