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, 8 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataResource.java b/src/tools/android/java/com/google/devtools/build/android/DataResource.java
index 44d4a9578c..d1836b8a13 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataResource.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataResource.java
@@ -22,7 +22,7 @@ import java.io.IOException;
  */
 public interface DataResource extends DataValue {
   /**
-   * Write as a resource using the supplied {@link MergeDataWriter}.
+   * Write as a resource using the supplied {@link AndroidDataWritingVisitor}.
    */
   void writeResource(FullyQualifiedName key, AndroidDataWritingVisitor mergedDataWriter)
       throws IOException, MergingException;
@@ -35,4 +35,11 @@ public interface DataResource extends DataValue {
    * @throws IllegalArgumentException if either resource cannot combine with the other.
    */
   DataResource combineWith(DataResource resource);
+
+  /**
+   * Queue up writing the resource to the given {@link AndroidResourceClassWriter}.
+   */
+  void writeResourceToClass(
+      FullyQualifiedName key,
+      AndroidResourceClassWriter resourceClassWriter);
 }