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, 4 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
index bf4e0817d1..4f953c8bd4 100644
--- a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
+++ b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
@@ -388,6 +388,10 @@ public class FullyQualifiedName implements DataKey, Comparable<FullyQualifiedNam
     return resourceName;
   }
 
+  public ResourceType type() {
+    return resourceType;
+  }
+
   private FullyQualifiedName(
       String pkg,
       ImmutableList<String> qualifiers,