Further Refactoring/Yak Shaving

* Extract the FieldInitializer with placeholder ids from the
AndroidResourceClassWriter
* Extract a resource sink interface from the AndroidResourceClassWriter (a little renaming, the change isn't actually that big.)

RELNOTES: None
PiperOrigin-RevId: 156053478

1 files changed, 2 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
index 235e0c2fc5..36eeabe9bd 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
@@ -88,8 +88,7 @@ public class ParsedAndroidData {
     private void checkForErrors() throws MergingException {
       if (!errors.isEmpty()) {
         MergingException mergingException =
-             MergingException
-                 .withMessage(String.format("%s Parse Error(s)", errors.size()));
+            MergingException.withMessage(String.format("%s Parse Error(s)", errors.size()));
         for (Exception e : errors) {
           mergingException.addSuppressed(e);
         }
@@ -500,7 +499,7 @@ public class ParsedAndroidData {
     return overwritingResources.get(name);
   }
 
-  void writeResourcesTo(AndroidResourceClassWriter writer) {
+  void writeResourcesTo(AndroidResourceSymbolSink writer) {
     for (Entry<DataKey, DataResource> resource : iterateDataResourceEntries()) {
       resource.getValue().writeResourceToClass((FullyQualifiedName) resource.getKey(), writer);
     }