Add a resource merger state -> R class writer.

Collects the R class fields from the new merger's
internal state, and then writes out either an
R.java or R.class. TBD which to use. One concern
is that users may want the javadoc. If so,
perhaps this could generate the R.class, and
then aapt could generate the srcjar off of the
build critical path.

Refactor the RClassGenerator to make it easier to
use from merger state (vs from R.txt).

--
MOS_MIGRATED_REVID=128181306

1 files changed, 19 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/UnwrittenMergedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/UnwrittenMergedAndroidData.java
index 2eddb3e1c9..cefd4454cd 100644
--- a/src/tools/android/java/com/google/devtools/build/android/UnwrittenMergedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/UnwrittenMergedAndroidData.java
@@ -85,6 +85,25 @@ public class UnwrittenMergedAndroidData {
     }
   }
 
+  public void writeResourceClass(AndroidResourceClassWriter resourceClassWriter)
+      throws IOException {
+    writeResourceClassItems(primary, resourceClassWriter);
+    writeResourceClassItems(transitive, resourceClassWriter);
+    resourceClassWriter.flush();
+  }
+
+  private void writeResourceClassItems(
+      ParsedAndroidData resources, AndroidResourceClassWriter resourceClassWriter)
+      throws IOException {
+    for (Entry<DataKey, DataResource> entry : resources.iterateDataResourceEntries()) {
+      // TODO(corysmith): Resolve the nit of casting to a FullyQualifiedName by sorting
+      // out the type structure and generics of DataKey, ParsedAndroidData, AndroidDataMerger and
+      // MergeConflict.
+      entry.getValue()
+          .writeResourceToClass((FullyQualifiedName) entry.getKey(), resourceClassWriter);
+    }
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)